Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-website/service-website-biz/src/main/java/com/usky/website/WebSiteApplication.java

@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
@@ -20,7 +21,7 @@ import java.net.UnknownHostException;
  * @author ruoyi
  */
 
-
+@EnableCaching
 @EnableFeignClients(basePackages = "com.usky")
 @MapperScan(value = "com.usky.website.mapper")
 @ComponentScan("com.usky")

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteArticleController.java

@@ -6,6 +6,8 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.website.domain.SiteArticle;
 import com.usky.website.service.SiteArticleService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -32,6 +34,7 @@ public class SiteArticleController {
      * @param pageSize   每页条数
      * @return
      */
+    @Cacheable(cacheNames = "siteArticle",sync = true)
     @GetMapping("siteArticleList")
     public ApiResult<CommonPage<SiteArticle>> siteArticleList(@RequestParam(value = "categoryid", required = false) Integer categoryid,
                                                               @RequestParam(value = "id", required = false) Integer id,
@@ -49,6 +52,7 @@ public class SiteArticleController {
      * @param siteArticle
      * @return
      */
+    @CacheEvict(cacheNames = "siteArticle",allEntries = true)
     @PostMapping("addSiteArticle")
     public ApiResult<Void> addSiteArticle(@RequestBody SiteArticle siteArticle) {
         siteArticleService.addSiteArticle(siteArticle);
@@ -61,6 +65,7 @@ public class SiteArticleController {
      * @param siteArticle
      * @return
      */
+    @CacheEvict(cacheNames = "siteArticle",allEntries = true)
     @PutMapping("updateSiteArticle")
     public ApiResult<Void> updateSiteArticle(@RequestBody SiteArticle siteArticle) {
         siteArticleService.updateSiteArticle(siteArticle);
@@ -73,6 +78,7 @@ public class SiteArticleController {
      * @param id 主键ID
      * @return
      */
+    @CacheEvict(cacheNames = "siteArticle",allEntries = true)
     @DeleteMapping("delSiteArticle")
     public ApiResult<Void> delSiteArticle(@RequestParam(value = "id") Integer id) {
         siteArticleService.delSiteArticle(id);

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteCategoryController.java

@@ -5,6 +5,8 @@ import com.usky.common.core.bean.ApiResult;
 import com.usky.website.domain.SiteCategory;
 import com.usky.website.service.SiteCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -29,6 +31,7 @@ public class SiteCategoryController {
      *
      * @return
      */
+    @Cacheable(cacheNames = "siteCategory",sync = true)
     @GetMapping("siteCategoryList")
     public ApiResult<List<SiteCategory>> siteCategoryList(@RequestParam(value = "categoryName", required = false) String categoryName) {
         return ApiResult.success(siteCategoryService.siteCategoryList(categoryName));
@@ -51,6 +54,7 @@ public class SiteCategoryController {
      * @param siteCategory
      * @return
      */
+    @CacheEvict(cacheNames="siteCategory", allEntries=true)
     @PostMapping("addSiteCategory")
     public ApiResult<Void> addSiteCategory(@RequestBody SiteCategory siteCategory) {
         siteCategoryService.addSiteCategory(siteCategory);
@@ -63,6 +67,7 @@ public class SiteCategoryController {
      * @param siteCategory
      * @return
      */
+    @CacheEvict(cacheNames="siteCategory", allEntries=true)
     @PutMapping("updateSiteCategory")
     public ApiResult<Void> updateSiteCategory(@RequestBody SiteCategory siteCategory) {
         siteCategoryService.updateSiteCategory(siteCategory);
@@ -75,6 +80,7 @@ public class SiteCategoryController {
      * @param id 主键ID
      * @return
      */
+    @CacheEvict(cacheNames="siteCategory", allEntries=true)
     @DeleteMapping("delSiteCategory")
     public ApiResult<Void> delSiteCategory(@RequestParam(value = "id") Integer id) {
         siteCategoryService.delSiteCategory(id);

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteArticle.java

@@ -2,6 +2,7 @@ package com.usky.website.domain;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -77,12 +78,12 @@ public class SiteArticle implements Serializable {
     /**
      * 创建时间;
      */
-    private LocalDateTime createdate;
+    private Date createdate;
 
     /**
      * 修改时间;
      */
-    private LocalDateTime modifydate;
+    private Date modifydate;
 
     /**
      * 内容排序

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteCategory.java

@@ -3,11 +3,17 @@ package com.usky.website.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -72,12 +78,12 @@ public class SiteCategory implements Serializable {
     /**
      * 创建时间;
      */
-    private LocalDateTime createdate;
+    private Date createdate;
 
     /**
      * 修改时间;
      */
-    private LocalDateTime modifydate;
+    private Date modifydate;
 
     /**
      * 栏目排序

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteArticleServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -110,13 +111,13 @@ public class SiteArticleServiceImpl extends AbstractCrudService<SiteArticleMappe
 
     @Override
     public void addSiteArticle(SiteArticle siteArticle) {
-        siteArticle.setCreatedate(LocalDateTime.now());
+        siteArticle.setCreatedate(new Date());
         this.save(siteArticle);
     }
 
     @Override
     public void updateSiteArticle(SiteArticle siteArticle) {
-        siteArticle.setModifydate(LocalDateTime.now());
+        siteArticle.setModifydate(new Date());
         this.updateById(siteArticle);
     }
 

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteCategoryServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -72,7 +73,7 @@ public class SiteCategoryServiceImpl extends AbstractCrudService<SiteCategoryMap
         if (list.size() > 0) {
             throw new BusinessException("栏目名称不能重复，请重新填写栏目名称");
         }
-        siteCategory.setCreatedate(LocalDateTime.now());
+        siteCategory.setCreatedate(new Date());
         siteCategory.setStatus(1);
         this.save(siteCategory);
     }
@@ -88,7 +89,7 @@ public class SiteCategoryServiceImpl extends AbstractCrudService<SiteCategoryMap
         if (list.size() > 0) {
             throw new BusinessException("栏目名称不能重复，请重新填写栏目名称");
         }
-        siteCategory.setModifydate(LocalDateTime.now());
+        siteCategory.setModifydate(new Date());
         this.updateById(siteCategory);
     }