学习园地 增加自定义模块

gis_cms/src/main/java/com/gis/cms/controller/GoodsModuleController.java

@@ -18,7 +18,7 @@ import javax.validation.Valid;
  * Created by owen on 2021/6/24 0008 9:54
  */
 @Slf4j
-@Api(tags = "v0.2-精密典藏模块管理")
+@Api(tags = "v0.3-二级模块管理")
 @RestController
 @RequestMapping("cms/goodsModule")
 public class GoodsModuleController {
@@ -28,11 +28,12 @@ public class GoodsModuleController {
 
 
 
-    @ApiOperation("列表")
-    @PostMapping("list")
-    public Result<GoodsModuleEntity> search() {
+    @ApiOperation(value = "v0.3-列表", notes = "goods:精品典藏， news:学习园地")
+    @PostMapping("list/{module}")
+    public Result<GoodsModuleEntity> search(@PathVariable String module) {
         Condition condition = new Condition(GoodsModuleEntity.class);
         // 排序：默认模块>自定义模块还创建时间正序；
+        condition.and().andEqualTo("module", module);
         condition.orderBy("isDefault").desc().orderBy("createTime").asc();
         return Result.success(entityService.findAll(condition));
     }
@@ -51,8 +52,10 @@ public class GoodsModuleController {
         return entityService.detail(id);
     }
 
-    @WebControllerLog(description = "模块管理-新增/编辑", addDb = true)
-    @ApiOperation(value = "新增/修改", notes = "display, 0:不显示， 1：显示")
+    @WebControllerLog(description = "v0.3-模块管理-新增/编辑", addDb = true)
+    @ApiOperation(value = "新增/修改", notes = "display, 0:不显示， 1：显示;" +
+            "goods, 模型类型: model:模型， img:图片， video：视频;" +
+            "news，模型类型: share:知识分享, info:知识阅历")
     @PostMapping("save")
     public Result saveEntity(@Valid @RequestBody GoodsModuleDto param) {
         return entityService.saveEntity(param);

gis_cms/src/main/java/com/gis/cms/controller/NewsController.java

@@ -20,7 +20,7 @@ import javax.validation.Valid;
  * Created by owen on 2021/6/24 0008 9:54
  */
 @Slf4j
-@Api(tags = "学习园地管理")
+@Api(tags = "v0.3-学习园地管理")
 @RestController
 @RequestMapping("cms/news")
 public class NewsController  {
@@ -30,14 +30,14 @@ public class NewsController  {
 
 
 
-    @ApiOperation("列表")
+    @ApiOperation("v0.3-列表")
     @PostMapping("list")
     public Result<NewsEntity> search(@Valid @RequestBody NewsPageDataDto param) {
         return entityService.search(param, null);
     }
 
     @WebControllerLog(description = "知识管理-新增/修改", addDb = true)
-    @ApiOperation("新增/修改")
+    @ApiOperation("v0.3-新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody NewsDto param) {
         return entityService.saveEntity(param);

gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -37,7 +37,7 @@ import javax.validation.Valid;
  * Created by owen on 2021/6/25 0025 17:17
  */
 @Slf4j
-@Api(tags = "v0.2-门户网站")
+@Api(tags = "v0.3-门户网站")
 @RestController
 @RequestMapping("api/web")
 public class WebController {
@@ -190,7 +190,7 @@ public class WebController {
 
 
     @WebControllerLog(description = "门户网站-知识列表(详情)")
-    @ApiOperation("知识-列表")
+    @ApiOperation("v0.3-知识-列表")
     @PostMapping("news/list")
     public Result<NewsEntity> newsList(@RequestBody NewsPageDataDto param){
         // 3：审核通过

gis_cms/src/main/java/com/gis/cms/entity/dto/GoodsDto.java

@@ -54,6 +54,9 @@ public class GoodsDto {
     @ApiModelProperty(value = "模块id", required = true)
     private Long goodsModuleId;
 
+    @ApiModelProperty(value = "链接，这两个类型会有：img:图片， video：视频")
+    private String link;
+
 
 
 

gis_cms/src/main/java/com/gis/cms/entity/dto/GoodsModuleDto.java

@@ -36,6 +36,10 @@ public class GoodsModuleDto  {
     @ApiModelProperty(value = "点赞功能，0：关， 1：开")
     private Integer isLike;
 
+    @NotBlank(message = "模块类型不能为空")
+    @ApiModelProperty(value = "模块类型, goods:精品典藏， news:学习园地", required = true)
+    private String module;
+
 
 
 

gis_cms/src/main/java/com/gis/cms/entity/dto/NewsDto.java

@@ -41,7 +41,9 @@ public class NewsDto implements Serializable {
     @ApiModelProperty(value = "链接")
     private String shareUrl;
 
-
+    @NotNull(message = "模块id不能为空")
+    @ApiModelProperty(value = "模块id", required = true)
+    private Long goodsModuleId;
 
 
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/NewsPageDataDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 
 /**
@@ -12,7 +13,11 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class NewsPageDataDto extends StatusPageDataDto{
 
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "类型， share：共享， info:阅览", required = true)
-    private String type;
+//    @NotBlank(message = "类型不能为空")
+//    @ApiModelProperty(value = "类型， share：共享， info:阅览", required = true)
+//    private String type;
+
+    @NotNull(message = "模块id不能为空")
+    @ApiModelProperty(value = "模块id", required = true)
+    private Long goodsModuleId;
 }

gis_cms/src/main/java/com/gis/cms/entity/po/GoodsEntity.java

@@ -57,6 +57,10 @@ public class GoodsEntity extends BaseEntity {
     @ApiModelProperty(value = "模块id")
     private Long goodsModuleId;
 
+
+    @ApiModelProperty(value = "链接，这两个类型会有：img:图片， video：视频")
+    private String link;
+
     @Transient
     @ApiModelProperty(value = "投票,0:否，1：是")
     private Integer isVote;

gis_cms/src/main/java/com/gis/cms/entity/po/GoodsModuleEntity.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -34,6 +35,8 @@ public class GoodsModuleEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "预设， 0：否， 1：是" )
     private Integer isDefault;
 
+    @ApiModelProperty(value = "模块类型, goods:精品典藏， news:学习园地")
+    private String module;
 
 
 

gis_cms/src/main/java/com/gis/cms/entity/po/NewsEntity.java

@@ -43,6 +43,9 @@ public class NewsEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "链接， type:share才有值")
     private String shareUrl;
 
+    @ApiModelProperty(value = "模块id")
+    private Long goodsModuleId;
+
 
 
 

gis_cms/src/main/java/com/gis/cms/service/impl/NewsServiceImpl.java

@@ -30,6 +30,7 @@ import tk.mybatis.mapper.entity.Condition;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -68,9 +69,14 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
             condition.and().andEqualTo("status", status);
         }
 
-        String type = param.getType();
-        if (StringUtils.isNotBlank(type)) {
-            condition.and().andEqualTo("type", type);
+//        String type = param.getType();
+//        if (StringUtils.isNotBlank(type)) {
+//            condition.and().andEqualTo("type", type);
+//        }
+
+        Long goodsModuleId = param.getGoodsModuleId();
+        if (goodsModuleId != null){
+            condition.and().andEqualTo("goodsModuleId", goodsModuleId);
         }
 
         if (display != null){

remark.md

@@ -2,4 +2,11 @@
 
 
 # sit 
-    本地服务器win servcie 服务器 192.168.0.245
+    本地服务器win servcie 服务器 192.168.0.245
+    
+# deploy 注意    
+    2022-3-23   sit
+        1. tb_goods新增字段：link
+        2. tb_news新增字段：goods_module_id
+        3. tb_good_module: 新增module=new的默认值
+        3. sys_resource: 新增权限数据 id:430\432\433