设置私人公开实例（包括搜索）

Author: WxrLZQ

springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Content.java

@@ -76,6 +76,12 @@ public class Content implements Serializable {
     @TableField(exist = false)
     @JsonProperty("myFavorites")
     private Boolean myFavorites=false;
+    /**
+     * 是否公开
+     */
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer ispublic;
     /**
      * 创建时间
      */

springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java

@@ -40,7 +40,7 @@ public class Example implements Serializable {
      * 是否公开
      */
     @TableField(value = "ispublic")
-    @JsonIgnore
+    @JsonProperty("ispublic")
     private Integer ispublic;
     /**
      * 标签

springboot-dubbo-api/src/main/java/com/lzq/api/service/ContentService.java

@@ -30,9 +30,10 @@ public interface ContentService {
      *
      * @param exampleId
      * @param username
+     * @param ispublic
      * @return
      */
-    Content getContent(String exampleId, String username);
+    Content getContent(String exampleId, String username, Integer ispublic);
 
     /**
      * 删除实例内容

springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java

@@ -47,18 +47,9 @@ public interface ExampleService {
      * @param currentPage 当前页
      * @return
      */
-    PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition);
+    PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition, Integer ispublic);
 
 
-    /**
-     * 查询用户公开的实例
-     *
-     * @param username    用户名
-     * @param currentPage 当前页
-     * @param orderCondition
-     * @return
-     */
-    PageInfo<Example> queryByPublic(String username, Integer currentPage,Integer orderCondition);
 
     /**
      * 删除实例（物理删除实例）
@@ -78,6 +69,7 @@ public interface ExampleService {
 
     /**
      * 通过实例id和用户名查询实例
+     *
      * @param example
      * @return
      */
@@ -86,20 +78,23 @@ public interface ExampleService {
 
     /**
      * 查询用户的回收站
+     *
      * @param username
      * @return
      */
     List<Example> queryRecycle(String username);
 
     /**
      * 恢复回收站实例
+     *
      * @param exampleId
      * @return
      */
     Boolean resumeExample(String exampleId);
 
     /**
      * 查询回收站是否有该实例
+     *
      * @param example
      * @return
      */

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ContentMapper.java

@@ -14,5 +14,5 @@
 public interface ContentMapper extends BaseMapper<Content> {
     void deleteContent(@Param("exampleId") String exampleId);
 
-    Content getContent(@Param("exampleId") String exampleId, @Param("username") String username);
+    Content getContent(@Param("exampleId") String exampleId, @Param("username") String username, @Param("ispublic") Integer ispublic);
 }

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ContentServiceImpl.java

@@ -26,12 +26,12 @@ public Boolean addContent(Content content) {
     public Boolean updateContent(Content content) {
         QueryWrapper<Content> wrapper = new QueryWrapper<>();
         wrapper.eq("example_id", content.getExampleId());
-        return baseMapper.update(content,wrapper) > 0 ? true : false;
+        return baseMapper.update(content, wrapper) > 0 ? true : false;
     }
 
     @Override
-    public Content getContent(String exampleId, String username) {
-        return baseMapper.getContent(exampleId,username);
+    public Content getContent(String exampleId, String username, Integer ispublic) {
+        return baseMapper.getContent(exampleId, username,ispublic);
     }
 
     @Override

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java

@@ -37,32 +37,13 @@ public boolean deleteById(String exampleId) {
     }
 
     @Override
-    public PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition) {
+    public PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition, Integer ispublic) {
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
         wrapper.eq("username", username);
-        switch (orderCondition){
-            case 0:
-                wrapper.orderByDesc("create_time");
-                break;
-            case 1:
-                wrapper.orderByDesc("update_time");
-                break;
-            case 2:
-                wrapper.orderByDesc("favorites");
-                break;
+        if (ispublic==0){
+            wrapper.eq("ispublic", 0);
         }
-        //当前页和每页条数
-        PageHelper.startPage(currentPage, 12);
-        List<Example> list = baseMapper.selectList(wrapper);
-        return new PageInfo<>(list);
-    }
-
-    @Override
-    public PageInfo<Example> queryByPublic(String username, Integer currentPage, Integer orderCondition) {
-        QueryWrapper<Example> wrapper = new QueryWrapper<>();
-        wrapper.eq("username", username);
-        wrapper.eq("ispublic", 0);
-        switch (orderCondition){
+        switch (orderCondition) {
             case 0:
                 wrapper.orderByDesc("create_time");
                 break;
@@ -95,8 +76,8 @@ public Example queryById(String exampleId) {
     @Override
     public Example queryByIdUsername(Example example) {
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
-        wrapper.eq("username",example.getUsername());
-        wrapper.eq("example_id",example.getExampleId());
+        wrapper.eq("username", example.getUsername());
+        wrapper.eq("example_id", example.getExampleId());
         return baseMapper.selectOne(wrapper);
     }
 
@@ -107,7 +88,7 @@ public List<Example> queryRecycle(String username) {
 
     @Override
     public Boolean resumeExample(String exampleId) {
-        return baseMapper.resumeExample(exampleId)>0?true:false;
+        return baseMapper.resumeExample(exampleId) > 0 ? true : false;
     }
 
     @Override

springboot-dubbo-service/src/main/resources/mapper/ContentMapper.xml

@@ -5,7 +5,7 @@
         delete from content where example_id=#{exampleId}
     </delete>
     <select id="getContent" resultType="com.lzq.api.pojo.Content">
-        select a.example_id, code_content, css_style, js_style, html_style, b.example_name, b.label, c.name
+        select a.example_id, code_content, css_style, js_style, html_style, b.example_name, b.label, c.name, b.ispublic
         from content a left join example b
         on
             a.example_id=b.example_id
@@ -14,5 +14,8 @@
             b.username=c.username
         where
             a.example_id=#{exampleId} and b.username=#{username}
+        <if test="ispublic=0">
+            and b.ispublic=0
+        </if>
     </select>
 </mapper>

springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml

@@ -37,13 +37,13 @@
         on
             b.example_id=c.example_id
         where
-              b.example_name like concat('%',#{queryContent},'%')
+              b.example_name like concat('%',#{queryContent},'%')  and b.ispublic=0
         <include refid="style"/>
         or
-              b.label like concat('%',#{queryContent},'%')
+              b.label like concat('%',#{queryContent},'%') and b.ispublic=0
         <include refid="style"/>
         or
-              a.name like concat('%',#{queryContent},'%')
+              a.name like concat('%',#{queryContent},'%')  and b.ispublic=0
         <include refid="style"/>
         and
               length(b.example_id)>0

springboot-dubbo-web/src/main/java/com/lzq/web/controller/ContentController.java

@@ -49,15 +49,18 @@ public class ContentController {
     public Map<String, Object> getContent(HttpServletRequest request, String exampleId, String username) {
         log.info("获取实例内容接口"+exampleId+"------"+username);
         String token = request.getHeader("token");
-        Content content = contentService.getContent(exampleId, username);
+        Content content=null;
         //当token不为空时用户已登录
         if (StringUtils.isNotBlank(token)){
+            content = contentService.getContent(exampleId, username,1);
             String s = JWTUtils.verify(token).getClaim("username").asString();
             List<Integer> favoriteslist = redisTemplate.opsForList().range(s + "fav", 0, -1);
             //判断改实例是否为用户的喜爱
             if (favoriteslist.contains(content.getExampleId())){
                 content.setMyFavorites(true);
             }
+        }else {
+            content = contentService.getContent(exampleId, username,0);
         }
         return ResultMapUtils.ResultMap(true, 0, content);
     }