展览增加类型固定类型

README.md

@@ -4,4 +4,7 @@
     deploy: 8.135.106.227 -linux
     web: http://8.135.106.227:8001/web/index.html
     doc: http://8.135.106.227:8001/doc.html
+    
+    2021-11-15 
+        部署生产环境的话，需要更新表 tb_exhibition.type  增加类型字段
 

gis_domain/src/main/java/com/gis/domain/dto/ExhibitionDto.java

@@ -23,10 +23,10 @@ public class ExhibitionDto {
     @ApiModelProperty(value = "内容")
     private String content;
 
-    @ApiModelProperty(value = "开始时间", required = true)
+    @ApiModelProperty(value = "开始时间")
     private LocalDateTime startTime;
 
-    @ApiModelProperty(value = "结束时间", required = true)
+    @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
 
     @ApiModelProperty(value = "图片", required = true)
@@ -35,6 +35,10 @@ public class ExhibitionDto {
     @ApiModelProperty(value = "文件名")
     private String fileName;
 
+
+    @ApiModelProperty(value = "类型, time:临时展览， fixed：固定展览")
+    private String type;
+
 //    @ApiModelProperty(value = "文件id, 多个以逗号分隔, 修改时：把新增加的fileId传给后端； 默认拿序号最前面的作为首页")
 //    private String fileIds;
 

gis_domain/src/main/java/com/gis/domain/po/ExhibitionEntity.java

@@ -42,6 +42,9 @@ public class ExhibitionEntity extends BaseEntity {
     @ApiModelProperty(value = "文件名")
     private String fileName;
 
+    @ApiModelProperty(value = "类型, time:临时展览， fixed：固定展览")
+    private String type;
+
 
 
 }

gis_service/src/main/java/com/gis/service/impl/ExhibitionServiceImpl.java

@@ -68,11 +68,6 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
             condition.and().orLike("name", "%" + searchKey + "%")
              .orLike("userName", "%" + searchKey + "%");
         }
-//        String startTime = param.getStartTime();
-//        String endTime = param.getEndTime();
-//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
-//            condition.and().andBetween("createTime", startTime, endTime);
-//        }
         String type = param.getType();
         if (StringUtils.isNotBlank(type)) {
             condition.and().andEqualTo("status", type);
@@ -88,8 +83,13 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         Long id = param.getId();
         ExhibitionEntity entity = null;
         if (id == null) {
+
             entity = new ExhibitionEntity();
             BeanUtils.copyProperties(param, entity);
+            // 用来过滤数据使用
+            if ("fixed".equals(param.getType())){
+                entity.setStatus("fixed");
+            }
             entity.setUserName(getTokenUserName(request));
             this.save(entity);
         } else {
@@ -102,28 +102,8 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
             this.update(entity);
         }
 
-        // 将模块id绑定到文件表
-//        String fileIds = param.getFileIds();
-//        if (StringUtils.isNotBlank(fileIds)) {
-//            Long moduleId = entity.getId();
-//            fileService.addModuleIdToFile(fileIds, moduleId, TypeCode.MODULE_EXHIBITION);
-//
-//            // 设置初始封面
-//            setIndex(fileIds, moduleId);
-//        }
         return Result.success(entity);
     }
-    
-    private void setIndex(String fileIds, Long moduleId){
-        List<FileEntity> entities = fileService.findIndexByModule(moduleId, TypeCode.MODULE_EXHIBITION);
-        if (entities.size() == 0) {
-            // 初始页面不存在，设置第一张为初始页面
-            String[] split = fileIds.split(",");
-            Long indexId = Long.valueOf(split[0]);
-            fileService.indexEnabled(indexId);
-        }
-    }
-    
 
 
     @Override
@@ -201,6 +181,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         LocalDateTime now = LocalDateTime.now();
         // 查询未开始、开始中的数据
         Condition condition = new Condition(ExhibitionEntity.class);
+        condition.and().andEqualTo("type", "time");
         condition.and().andEqualTo("status", "unstart").orEqualTo("status", "start");
         List<ExhibitionEntity> allList = this.findAll(condition);
         log.info("需要检查状态的数据数量： {}", allList.size());

gis_web/src/main/java/com/gis/web/controller/CountAnswerController.java

@@ -1,9 +1,6 @@
 package com.gis.web.controller;
 
-import com.gis.common.constant.MsgCode;
 import com.gis.common.util.Result;
-import com.gis.domain.dto.CountAnswerDto;
-import com.gis.domain.po.CountAnswerEntity;
 import com.gis.service.CountAnswerService;
 import com.gis.service.aop.WebControllerLog;
 import io.swagger.annotations.Api;
@@ -11,8 +8,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.List;
 
 
 /**
@@ -27,13 +22,6 @@ public class CountAnswerController extends BaseController {
     private CountAnswerService entityService;
 
 
-//    @WebControllerLog(description = "问卷统计-新增", addDb = true)
-//    @ApiOperation("新增")
-//    @PostMapping("save")
-//    public Result<CountAnswerEntity> save(@Valid @RequestBody List<CountAnswerDto> param) {
-//        return entityService.saveEntity(param);
-//    }
-
 
     @WebControllerLog(description = "问卷统计-详情")
     @ApiOperation(value = "详情", notes = "0:百分比， 1：计数")

gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -113,12 +113,6 @@ public class WebController {
     }
 
 
-//    @ApiOperation(value = "博物馆访问量")
-//    @GetMapping("museum/getVisit")
-//    public Result museumGetVisit(){
-//        return museumInfoService.getVisitByModule("web");
-//    }
-
 
     @ApiOperation(value = "资讯-列表", notes = "type, news：新闻， info:信息， activity：活动")
     @PostMapping("news/list")
@@ -135,7 +129,7 @@ public class WebController {
 
 
 
-    @ApiOperation(value = "展览-列表", notes = "type, 状态， unstart:未开始， start:开始， end:结束")
+    @ApiOperation(value = "展览-列表", notes = "type, 状态， unstart:未开始， start:开始， end:结束, fixed:固定展览")
     @PostMapping("exhibition/list")
     public Result exhibitionList(@RequestBody TypePageDto param){
         return exhibitionService.search(param);