修改实例时才更新update_time,其余修改不会更新update_time

WxrLZQ · WxrLZQ · commit 926b63adfb44 · 2021-09-25T20:25:49.000+08:00
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Content.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Content.java
@@ -80,8 +80,8 @@ public class Content implements Serializable {
      * 是否公开
      */
     @TableField(exist = false)
-    @JsonIgnore
-    private Integer ispublic;
+    @JsonProperty("ispublic")
+    private Boolean ispublic;
     /**
      * 创建时间
      */
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java
@@ -41,7 +41,7 @@ public class Example implements Serializable {
      */
     @TableField(value = "ispublic")
     @JsonProperty("ispublic")
-    private Integer ispublic;
+    private Boolean ispublic;
     /**
      * 标签
      */
@@ -87,7 +87,7 @@ public class Example implements Serializable {
      * 更新时间
      */
     @JsonProperty("updateTime")
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_time",fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
     private Date updateTime;
     /**
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java b/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java
@@ -100,4 +100,11 @@ public interface ExampleService {
      */
     Example getExampleByDeleted(Example example);
 
+    /**
+     * 查询用户的不公开实例
+     * @param username
+     * @return
+     */
+    Integer getCountIspublic(String username);
+
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleMapper.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleMapper.java
@@ -23,4 +23,8 @@ public interface ExampleMapper extends BaseMapper<Example> {
     Integer resumeExample(@Param("exmapleId") String exampleId);
 
     Example getExampleByDeleted(Example example);
+
+    Integer getCountIspublic(@Param("username") String username);
+
+    Integer addFavorites(Example example);
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java
@@ -40,8 +40,8 @@ public boolean deleteById(String exampleId) {
     public PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition, Integer ispublic) {
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
         wrapper.eq("username", username);
-        if (ispublic==0){
-            wrapper.eq("ispublic", 0);
+        if (ispublic.equals("0")){
+            wrapper.eq("ispublic", true);
         }
         switch (orderCondition) {
             case 0:
@@ -96,5 +96,10 @@ public Example getExampleByDeleted(Example example) {
         return baseMapper.getExampleByDeleted(example);
     }
 
+    @Override
+    public Integer getCountIspublic(String username) {
+        return baseMapper.getCountIspublic(username);
+    }
+
 
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/FavoritesServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/FavoritesServiceImpl.java
@@ -31,17 +31,17 @@ public class FavoritesServiceImpl extends ServiceImpl<FavoritesMapper, Favorites
     public Boolean addFavorites(Favorites favorites) {
         Boolean insert = baseMapper.insert(favorites) > 0 ? true : false;
         int i1 = 0;
+        int i2 = 0;
         if (insert) {
             do {
+                i2++;
                 //用来查询关注人
                 QueryWrapper<Example> wrapper = new QueryWrapper<>();
                 wrapper.eq("example_id", favorites.getExampleId());
                 //获取喜爱的用例
                 Example example = exampleMapper.selectOne(wrapper);
-                example.setFavorites(example.getFavorites() + 1);
-                //更新喜爱人数
-                i1 = exampleMapper.update(example, wrapper);
-            } while (i1 == 0);
+                i1 = exampleMapper.addFavorites(example);
+            } while (i1 == 0 || i2 < 5);
             return true;
         } else {
             return false;
@@ -56,8 +56,10 @@ public Boolean cancelFavorites(Favorites favorites) {
         wrapper.eq("example_id", favorites.getExampleId());
         Boolean delete = baseMapper.delete(wrapper) > 0 ? true : false;
         int i1 = 0;
+        int i2 = 0;
         if (delete) {
             do {
+                i2++;
                 //用来查询关注人
                 QueryWrapper<Example> exampleQueryWrapper = new QueryWrapper<>();
                 exampleQueryWrapper.eq("example_id", favorites.getExampleId());
@@ -66,9 +68,9 @@ public Boolean cancelFavorites(Favorites favorites) {
                 example.setFavorites(example.getFavorites() - 1);
                 //更新喜爱人数
                 i1 = exampleMapper.update(example, exampleQueryWrapper);
-            } while (i1 == 0);
+            } while (i1 == 0 || i2 < 5);
             return true;
-        }else {
+        } else {
             return false;
         }
     }
diff --git a/springboot-dubbo-service/src/main/resources/mapper/ContentMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/ContentMapper.xml
@@ -14,8 +14,8 @@
             b.username=c.username
         where
             a.example_id=#{exampleId} and b.username=#{username}
-        <if test="ispublic=0">
-            and b.ispublic=0
+        <if test="ispublic==0">
+            and b.ispublic='1'
         </if>
     </select>
 </mapper>
diff --git a/springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml b/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},'%')  and b.ispublic=0
+              b.example_name like concat('%',#{queryContent},'%')  and b.ispublic='1'
         <include refid="style"/>
         or
-              b.label like concat('%',#{queryContent},'%') and b.ispublic=0
+              b.label like concat('%',#{queryContent},'%') and b.ispublic='1'
         <include refid="style"/>
         or
-              a.name like concat('%',#{queryContent},'%')  and b.ispublic=0
+              a.name like concat('%',#{queryContent},'%')  and b.ispublic='1'
         <include refid="style"/>
         and
               length(b.example_id)>0
diff --git a/springboot-dubbo-service/src/main/resources/mapper/ExampleMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/ExampleMapper.xml
@@ -27,5 +27,21 @@
         where
               username=#{username} and example_id=#{exampleId} and deleted=1
     </select>
+    <select id="getCountIspublic" resultType="java.lang.Integer">
+        select
+               count(*)
+        from example
+        where
+            username=#{username} and ispublic='0'
+    </select>
+    <update id="addFavorites">
+        update example
+        set
+            favorites=favorites+1
+        where
+            example_id=#{exampleId}
+        and
+            version=#{version}
+    </update>
 
 </mapper>
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java
@@ -70,13 +70,13 @@ public class ExampleController {
 
 
     /**
-     * 创建一个实例
+     * 创建/更新实例
      *
      * @param example 实例对象
      * @return
      */
     @PostMapping(value = "/createExample")
-    @ApiOperation("创建一个实例")
+    @ApiOperation("创建/更新实例")
     public Map<String, Object> CreateFile(HttpServletRequest request,Example example, Content exampleContent, String content) {
         log.info(example.toString());
         String token = request.getHeader("token");
@@ -87,11 +87,12 @@ public Map<String, Object> CreateFile(HttpServletRequest request,Example example
         // String uuid = ExampleUtils.getUUid();
         Boolean bol =false;
         //随机生成uuid
-        //判断用户是保存实例还是第一次创建实例
+        //更新实例
         if (example.getExampleId()!=null){
             try {
                 //通过id查询实例信息
                 Example query = exampleService.queryById(example.getExampleId());
+                query.setUpdateTime(new Date());
                 //获取实例的文件名和图片key
                 //修改实例内容
                 bol = contentService.updateContent(exampleContent);
@@ -303,14 +304,21 @@ public Map<String,Object> deleteRightNow(Example example){
     @ApiOperation("更新实例")
     @PutMapping("/")
     public Map<String,Object> updateExample(HttpServletRequest request,Example example){
+        log.info("更新实例"+example.toString());
         //获取token中的用户名
         String username = JWTUtils.verify(request.getHeader("token"))
                 .getClaim("username").asString();
         //存入用户名进行查询
         example.setUsername(username);
-        Example query = exampleService.queryByIdUsername(example);
         Boolean update=false;
-        if (query!=null){
+        if (example.getIspublic()!=null && !example.getIspublic()){
+            Integer ispublic = exampleService.getCountIspublic(username);
+            if (ispublic<5){
+                update = exampleService.update(example);
+            }else {
+                return ResultMapUtils.ResultMap(update,1,"私人实例已上限");
+            }
+        }else {
             update = exampleService.update(example);
         }
         return ResultMapUtils.ResultMap(update,0,null);
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/IndexController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/IndexController.java
@@ -19,6 +19,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/utils/ExampleUtils.java b/springboot-dubbo-web/src/main/java/com/lzq/web/utils/ExampleUtils.java
@@ -62,7 +62,7 @@ public void setBucket(String bucket) {
      * @return
      * @throws IOException
      */
-    public static String screenshot(String username, String filename) throws IOException {
+    public static String screenshot(String username, String filename) throws IOException, InterruptedException {
         //使用截屏工具进行截屏
         //启用chrome驱动
         //chrome驱动的位置
@@ -77,10 +77,10 @@ public static String screenshot(String username, String filename) throws IOExcep
         int winWidth = 960;
         Dimension dim = new Dimension(winWidth, winHeight);
         broswer.manage().window().setSize(dim);
-        //等待1秒,
-        broswer.manage().timeouts().implicitlyWait(1, TimeUnit.SECONDS);
         //打开url
         broswer.get("http://localhost:8090/" + username + "/" + filename + ".html");
+        //等待10秒,
+        broswer.manage().timeouts().implicitlyWait(3, TimeUnit.SECONDS);
         //截图
         File screenshotAs = ((TakesScreenshot) broswer).getScreenshotAs(OutputType.FILE);
         //生成的webp文件
@@ -91,9 +91,9 @@ public static String screenshot(String username, String filename) throws IOExcep
         String imgName = QiniuyunUtils.uploadFile(file,username);
         //删除截图原始图片缓存
         screenshotAs.delete();
-        // boolean delete = file.delete();
+        boolean delete = file.delete();
         broswer.quit();
-        // log.info(Boolean.toString(delete));
+        log.info(Boolean.toString(delete));
         return imgName;
 
     }
@@ -134,7 +134,7 @@ public void SaveExampleContent(Example example, String content, ExampleService e
             //更新实例
             bol = exampleService.update(example);
             log.info("截图成功");
-        } catch (IOException e) {
+        } catch (IOException | InterruptedException e) {
             e.printStackTrace();
             log.info("截图失败");
             // return bol;

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,8 @@ public interface ExampleMapper extends BaseMapper<Example> {`
`23`	`23`	`Integer resumeExample(@Param("exmapleId") String exampleId);`
`24`	`24`
`25`	`25`	`Example getExampleByDeleted(Example example);`
	`26`	`+`
	`27`	`+ Integer getCountIspublic(@Param("username") String username);`
	`28`	`+`
	`29`	`+ Integer addFavorites(Example example);`
`26`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ public boolean deleteById(String exampleId) {`
`40`	`40`	`public PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition, Integer ispublic) {`
`41`	`41`	`QueryWrapper<Example> wrapper = new QueryWrapper<>();`
`42`	`42`	`wrapper.eq("username", username);`
`43`		`- if (ispublic==0){`
`44`		`- wrapper.eq("ispublic", 0);`
	`43`	`+ if (ispublic.equals("0")){`
	`44`	`+ wrapper.eq("ispublic", true);`
`45`	`45`	`}`
`46`	`46`	`switch (orderCondition) {`
`47`	`47`	`case 0:`
`@@ -96,5 +96,10 @@ public Example getExampleByDeleted(Example example) {`
`96`	`96`	`return baseMapper.getExampleByDeleted(example);`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ @Override`
	`100`	`+ public Integer getCountIspublic(String username) {`
	`101`	`+ return baseMapper.getCountIspublic(username);`
	`102`	`+ }`
	`103`	`+`
`99`	`104`
`100`	`105`	`}`