更新 定时任务

gis_application/src/main/java/com/gis/GisApplication.java

@@ -2,8 +2,9 @@ package com.gis;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
-
+@EnableScheduling
 @SpringBootApplication
 public class GisApplication {
 

gis_common/src/main/java/com/gis/common/util/AliyunOssUtil.java

@@ -17,6 +17,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -137,7 +138,7 @@ public class AliyunOssUtil {
         if (filepaths == null) {
             return;
         }
-        log.info("开始批量上传到阿里云：" + new Date().toString());
+        log.info("开始批量上传到阿里云：" + LocalDateTime.now().toString());
         if (filepaths.size() > 50) {
             int i = 1;
             for (String filePath : filepaths.keySet()) {
@@ -155,7 +156,7 @@ public class AliyunOssUtil {
                 upload(filePath, filepaths.get(filePath));
             }
         }
-        log.info("批量上传阿里云完毕：" + new Date().toString());
+        log.info("批量上传阿里云完毕：" + LocalDateTime.now().toString());
     }
 
 
@@ -249,7 +250,7 @@ public class AliyunOssUtil {
 
     /** 返回时间戳名字*/
     private static String getTimeName(MultipartFile file){
-        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+        String time = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         String originalFilename = file.getOriginalFilename();
         String suffix = StringUtils.substringAfterLast(originalFilename, ".");
         return time+ "." + suffix;

gis_common/src/main/java/com/gis/common/util/FileUtils.java

@@ -36,7 +36,7 @@ public class FileUtils {
             return null;
         }
 
-        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+        String time = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         savePath = savePath + time + File.separator;
         FileUtil.mkdir(time);
 
@@ -80,7 +80,7 @@ public class FileUtils {
             return null;
         }
 
-        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+        String time = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
 
         String fileName = file.getOriginalFilename();
 
@@ -230,7 +230,7 @@ public class FileUtils {
 
     /** 返回时间戳名字*/
     public static String getTimeName(MultipartFile file){
-        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+        String time = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         String originalFilename = file.getOriginalFilename();
         String suffix = StringUtils.substringAfterLast(originalFilename, ".");
         return time+ "." + suffix;

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

@@ -1,19 +0,0 @@
-package com.gis.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by owen on 2021/6/8 0028 16:36
- */
-@Data
-public class ActivityPageDto extends PageDto {
-
-
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-}

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

@@ -12,6 +12,9 @@ public class GoodsPageDto extends PageDto{
     @ApiModelProperty(value = "臧品分类Id")
     private Long goodsTypeId;
 
+    @ApiModelProperty(value = "时代")
+    private String age;
+
 
 
 

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -19,14 +21,14 @@ public abstract class BaseEntity {
     private Long id;
 
     @ApiModelProperty(value = "创建时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+//    @Temporal(TemporalType.TIMESTAMP)
+//    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+//    @Temporal(TemporalType.TIMESTAMP)
+//    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 
     /**
      * 用来批量操作的

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

@@ -4,7 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * Created by owen on 2021/4/20 0010 17:39
@@ -18,10 +19,10 @@ public class ExhibitionEntity extends BaseEntity {
     private String name;
 
     @ApiModelProperty(value = "开始时间")
-    private Date startTime;
+    private LocalDateTime startTime;
 
     @ApiModelProperty(value = "结束时间")
-    private Date endTime;
+    private LocalDateTime endTime;
 
     @ApiModelProperty(value = "内容")
     private String content;
@@ -32,6 +33,9 @@ public class ExhibitionEntity extends BaseEntity {
     @ApiModelProperty(value = "目录")
     private String code;
 
+    @ApiModelProperty(value = "状态， unstart:未开始， start:开始， end:结束")
+    private String status;
+
 
 
 }

gis_mapper/src/main/java/com/gis/mapper/MuseumInfoMapper.java

@@ -4,6 +4,7 @@ package com.gis.mapper;
 import com.gis.domain.po.MuseumInfoEntity;
 import com.gis.domain.po.NewsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
 
@@ -11,9 +12,6 @@ import org.springframework.stereotype.Component;
 @Mapper
 public interface MuseumInfoMapper extends IBaseMapper<MuseumInfoEntity, Long> {
 
-
-
-
-
-
+    @Select("SELECT COUNT(id) from tb_visit where is_delete=0 and module=#{module}")
+    Integer getVisitByModule(String module);
 }

gis_mapper/src/main/java/com/gis/mapper/provider/GoodsProvider.java

@@ -37,6 +37,11 @@ public class GoodsProvider {
             sql.append(" and  goods_type_id = ").append(goodsTypeId);
         }
 
+        String age = param.getAge();
+        if (StringUtils.isNotBlank(age)){
+            sql.append(" and  age = ").append(age);
+        }
+
 
         sql.append(" order by create_time desc");
         log.info("sql: {}", sql.toString());

gis_service/src/main/java/com/gis/service/ActivityService.java

@@ -3,8 +3,7 @@ package com.gis.service;
 
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
-import com.gis.domain.dto.ActivityPageDto;
-import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ActivityEntity;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -16,7 +15,7 @@ public interface ActivityService extends IBaseService<ActivityEntity, Long> {
 
 
 
-    Result search(ActivityPageDto param);
+    Result search(TypePageDto param);
 
 
     Result remove(Long id);

gis_service/src/main/java/com/gis/service/ExhibitionService.java

@@ -13,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
 public interface ExhibitionService extends IBaseService<ExhibitionEntity, Long> {
 
 
-    Result<ExhibitionEntity> search(PageDto param);
+    Result<ExhibitionEntity> search(TypePageDto param);
 
     Result saveEntity(ExhibitionDto param);
 
@@ -26,4 +26,6 @@ public interface ExhibitionService extends IBaseService<ExhibitionEntity, Long>
     Result setIndex(Long fileId);
 
     Result detail(Long id);
+
+    void checkStatus();
 }

gis_service/src/main/java/com/gis/service/GoodsTypeServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -43,7 +44,7 @@ public class GoodsTypeServiceImpl extends IBaseServiceImpl<GoodsTypeEntity, Long
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             this.update(entity);
         }
 
@@ -58,7 +59,7 @@ public class GoodsTypeServiceImpl extends IBaseServiceImpl<GoodsTypeEntity, Long
             return Result.success();
         }
         entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         this.update(entity);
 
         return Result.success();

gis_service/src/main/java/com/gis/service/MuseumInfoService.java

@@ -24,4 +24,6 @@ public interface MuseumInfoService extends IBaseService<MuseumInfoEntity, Long>
 
 
     Result upload(MultipartFile file);
+
+    Result getVisitByModule(String module);
 }

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

@@ -5,7 +5,7 @@ import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.AliyunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
-import com.gis.domain.dto.ActivityPageDto;
+import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ActivityEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.ActivityMapper;
@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Map;
 
@@ -52,7 +53,7 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
 
 
     @Override
-    public Result search(ActivityPageDto param) {
+    public Result search(TypePageDto param) {
         Condition condition = new Condition(ActivityEntity.class);
         String searchKey = param.getSearchKey();
         if (StringUtils.isNotBlank(searchKey)) {
@@ -78,7 +79,7 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
             return Result.success();
         }
         entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         this.update(entity);
         return  Result.success();
     }
@@ -99,7 +100,7 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             this.update(entity);
 
         }
@@ -123,7 +124,7 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
     @Override
     public Result upload(MultipartFile file, String code) {
         if (StringUtils.isBlank(code)) {
-            code = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+            code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         }
         Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "activity/" + code + "/");
         result.put("code", code);

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

@@ -7,6 +7,7 @@ import com.gis.common.util.AliyunOssUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ExhibitionDto;
 import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ExhibitionEntity;
 import com.gis.domain.po.FileEntity;
 import com.gis.mapper.ExhibitionMapper;
@@ -14,6 +15,7 @@ import com.gis.mapper.IBaseMapper;
 import com.gis.service.ExhibitionService;
 import com.gis.service.FileService;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,8 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -29,8 +33,9 @@ import java.util.Map;
 
 
 /**
- * Created by owen on 2020/3/11 0011 16:16
+ * Created by owen on 2021/6/18 0011 16:16
  */
+@Slf4j
 @Service
 public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Long> implements ExhibitionService {
 
@@ -55,7 +60,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
 
 
     @Override
-    public Result<ExhibitionEntity> search(PageDto param) {
+    public Result<ExhibitionEntity> search(TypePageDto param) {
         Condition condition = new Condition(ExhibitionEntity.class);
         String searchKey = param.getSearchKey();
         if (StringUtils.isNotBlank(searchKey)) {
@@ -68,6 +73,10 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
 //        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);
+        }
 
         condition.orderBy("createTime").desc();
         PageInfo<ExhibitionEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
@@ -89,7 +98,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             this.update(entity);
         }
 
@@ -121,7 +130,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
     public Result upload(MultipartFile file, String code) {
 
         if (StringUtils.isBlank(code)) {
-            code = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+            code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         }
 
         Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "exhibition/" + code + "/");
@@ -142,7 +151,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
             return Result.success();
         }
         entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         this.update(entity);
 
         return Result.success();
@@ -157,7 +166,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
 
         entity.setIsDelete(1);
         entity.setIsIndex(0);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         fileService.update(entity);
         return Result.success();
     }
@@ -187,5 +196,54 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         return Result.success(result);
     }
 
+    @Override
+    public void checkStatus() {
+        LocalDateTime now = LocalDateTime.now();
+        // 查询未开始、开始中的数据
+        Condition condition = new Condition(ExhibitionEntity.class);
+        condition.and().andEqualTo("status", "unstart");
+        condition.and().andEqualTo("status", "start");
+        List<ExhibitionEntity> allList = this.findAll(condition);
+        log.info("需要检查状态的数据数量： {}", allList.size());
+        for (ExhibitionEntity entity : allList) {
+            String status = entity.getStatus();
+
+            // 未开始
+            boolean flag = false;
+            if ("unstart".equals(status)) {
+                LocalDateTime startTime = entity.getStartTime();
+                if (startTime == null) {
+                    continue;
+                }
+                // 活动开始：开始时间 < 当前时间
+                boolean before = startTime.isBefore(now);
+                if (before) {
+                    entity.setStatus("start");
+                    flag = true;
+                }
+                log.info("开始时间：{},  当前时间：{},  状态：{}", startTime, now, entity.getStatus());
+
+                // 已开始
+            } else if ("start".equals(status)) {
+                LocalDateTime endTime = entity.getEndTime();
+                if (endTime == null) {
+                    continue;
+                }
+                // 活动结束： 结束时间 < 当前时间
+                boolean before = endTime.isBefore(now);
+                if (before) {
+                    entity.setStatus("end");
+                    flag = true;
+                }
+                log.info("结束时间：{},  当前时间：{},  状态：{}", endTime, now, entity.getStatus());
+            }
+            if (flag) {
+                entity.setUpdateTime(LocalDateTime.now());
+                this.update(entity);
+            }
+        }
+        log.info("状态检查完成");
+    }
+
 
 }

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

@@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -75,7 +76,7 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             this.update(entity);
         }
 
@@ -95,7 +96,7 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
             return Result.success();
         }
         entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         this.update(entity);
 
         return Result.success();

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

@@ -16,6 +16,7 @@ import tk.mybatis.mapper.entity.Condition;
 import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -108,10 +109,10 @@ public abstract class IBaseServiceImpl<T extends BaseEntity, ID extends Serializ
     public int save(T entity) {
         //migration之后要删掉判断
         if (entity.getCreateTime() == null){
-            entity.setCreateTime(new Date());
+            entity.setCreateTime(LocalDateTime.now());
         }
         if (entity.getUpdateTime() == null){
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
         }
         entity.setIsDelete(0);
         return getBaseMapper().insertSelective(entity);
@@ -121,7 +122,7 @@ public abstract class IBaseServiceImpl<T extends BaseEntity, ID extends Serializ
     public int update(T entity) {
         //migration之后要删掉判断
         if (entity.getUpdateTime() == null){
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
         }
         return getBaseMapper().updateByPrimaryKeySelective(entity);
     }
@@ -130,7 +131,7 @@ public abstract class IBaseServiceImpl<T extends BaseEntity, ID extends Serializ
     public int updateAll(T entity) {
         //migration之后要删掉判断
         if (entity.getUpdateTime() == null){
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
         }
         return getBaseMapper().updateByPrimaryKey(entity);
     }

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

@@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -68,7 +69,7 @@ public class MuseumInfoServiceImpl extends IBaseServiceImpl<MuseumInfoEntity, Lo
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             this.update(entity);
         }
 
@@ -84,7 +85,7 @@ public class MuseumInfoServiceImpl extends IBaseServiceImpl<MuseumInfoEntity, Lo
             return Result.success();
         }
         entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         this.update(entity);
 
         return Result.success();
@@ -96,5 +97,11 @@ public class MuseumInfoServiceImpl extends IBaseServiceImpl<MuseumInfoEntity, Lo
         return Result.success(result);
     }
 
+    @Override
+    public Result getVisitByModule(String module) {
+         Integer count = entityMapper.getVisitByModule(module);
+        return Result.success(count);
+    }
+
 
 }

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

@@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -88,7 +89,7 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             this.update(entity);
         }
 
@@ -103,7 +104,7 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
             return Result.success();
         }
         entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
+        entity.setUpdateTime(LocalDateTime.now());
         this.update(entity);
 
         return Result.success();
@@ -117,7 +118,7 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
     @Override
     public Result upload(MultipartFile file, String code) {
         if (StringUtils.isBlank(code)) {
-             code = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+             code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
         }
         Map<String, Object> result = aliyunOssUtil.uploadByByte(file, "news/" + code + "/");
         result.put("code", code);

gis_service/src/main/java/com/gis/service/task/ScheduleTask.java

@@ -0,0 +1,44 @@
+package com.gis.service.task;
+
+import com.gis.service.ExhibitionService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * Created by owen on 2021/6/17 0017 16:40
+ * 定时任务
+ */
+@Slf4j
+@Component
+public class ScheduleTask {
+
+    @Autowired
+    ExhibitionService exhibitionService;
+
+    /**
+     * 需要在启动类加入注解
+     * 每天24点检查未开始的活动
+     * 每天24点执行一次  @Scheduled(cron=" 0 0 0 * * ? ") @Scheduled(cron=" * 1  * * ? ")
+     *
+     * Scheduled(cron=" 10 0/5 * * * ? ")   //每五分钟执行一次
+     */
+//    @Scheduled(cron=" 10 0/5 * * * ? ")
+    @Scheduled(cron = "0 0 4 * * ?")
+    public void checkExhibition() {
+
+        log.warn("start 每天00:03开始执行定时任务：检查展览营业状态");
+        try {
+            exhibitionService.checkStatus();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+        log.warn("end 更新任务完成");
+
+    }
+
+}

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

@@ -2,8 +2,7 @@ package com.gis.web.controller;
 
 import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
-import com.gis.domain.dto.ActivityPageDto;
-import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ActivityEntity;
 import com.gis.service.ActivityService;
 import com.gis.service.aop.WebControllerLog;
@@ -29,9 +28,9 @@ public class ActivityController extends BaseController {
 
 
 
-    @ApiOperation("列表")
+    @ApiOperation(value = "列表",notes = "type: 类型, online:线上， volunteer：志愿者")
     @PostMapping("list")
-    public Result<ActivityEntity> list(@RequestBody ActivityPageDto param) {
+    public Result<ActivityEntity> list(@RequestBody TypePageDto param) {
         return activityService.search(param);
     }
 

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

@@ -5,6 +5,7 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.ExhibitionDto;
 import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ExhibitionEntity;
 import com.gis.domain.po.NewsEntity;
 import com.gis.service.ExhibitionService;
@@ -32,9 +33,9 @@ public class ExhibitionController extends BaseController {
 
 
 
-    @ApiOperation("列表")
+    @ApiOperation(value = "列表", notes = "type, 状态， unstart:未开始， start:开始， end:结束")
     @PostMapping("list")
-    public Result<ExhibitionEntity> list(@RequestBody PageDto param) {
+    public Result<ExhibitionEntity> list(@RequestBody TypePageDto param) {
         return entityService.search(param);
     }
 

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

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import java.util.Date;
 
 /**
  * Created by owen on 2021/5/14 0008 9:54

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

@@ -119,7 +119,7 @@ public class SceneController extends BaseController {
 
         String fileName = file.getOriginalFilename();
         log.info("原始文件名： {}", fileName);
-//        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
+//        String time = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
 //        String suffix = StringUtils.substringAfterLast(fileName, ".");
 //        suffix = StringUtils.lowerCase(suffix);
 

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -75,7 +76,7 @@ public class SysUserController extends BaseController {
                 return Result.failure("用户不存在");
             }
             BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             userService.update(entity);
         }
 
@@ -110,7 +111,7 @@ public class SysUserController extends BaseController {
         }
 
         user.setPassword(PasswordUtils.encrypt(user.getUserName(), param.getNewPassword(), PasswordUtils.getStaticSalt()));
-        user.setUpdateTime(new Date());
+        user.setUpdateTime(LocalDateTime.now());
         userService.update(user);
         return Result.success();
     }
@@ -128,7 +129,7 @@ public class SysUserController extends BaseController {
         }
 
         user.setPassword(PasswordUtils.encrypt(user.getUserName(), "123456", PasswordUtils.getStaticSalt()));
-        user.setUpdateTime(new Date());
+        user.setUpdateTime(LocalDateTime.now());
         userService.update(user);
         return Result.success();
     }
@@ -151,7 +152,7 @@ public class SysUserController extends BaseController {
         }
 
         user.setStatus(status);
-        user.setUpdateTime(new Date());
+        user.setUpdateTime(LocalDateTime.now());
         userService.update(user);
         return Result.success();
     }
@@ -171,7 +172,7 @@ public class SysUserController extends BaseController {
                 return Result.failure("管理员账户不能删除");
             }
             entity.setIsDelete(1);
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             userService.update(entity);
 
             deleteFile(entity.getThumb());

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

@@ -3,9 +3,8 @@ package com.gis.web.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import com.gis.common.util.Result;
-import com.gis.domain.dto.GoodsPageDto;
-import com.gis.domain.dto.MaterialDeteleDto;
-import com.gis.domain.dto.MaterialDto;
+import com.gis.domain.dto.*;
+import com.gis.domain.po.CommentEntity;
 import com.gis.domain.po.GoodsEntity;
 import com.gis.domain.po.ActivityEntity;
 import com.gis.domain.po.VisitEntity;
@@ -17,15 +16,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.Date;
+
 
 /**
- * Created by owen on 2021/5/18 0018 14:50
+ * Created by owen on 2021/6/18 0018 14:50
  */
-@ApiIgnore
 @Slf4j
 @Api(tags = "展示页")
 @RestController
@@ -49,6 +46,18 @@ public class WebController {
     @Autowired
     NewsService newsService;
 
+    @Autowired
+    MuseumInfoService museumInfoService;
+
+    @Autowired
+    ExhibitionService exhibitionService;
+
+    @Autowired
+    ActivityService activityService;
+
+    @Autowired
+    CommentService commentService;
+
     @ApiOperation(value = "保存网站访问记录", notes = "type, web:管网, scene:线上史馆")
     @GetMapping("addVisitWeb/{type}")
     public Result addVisitWeb(@PathVariable String type) {
@@ -64,8 +73,63 @@ public class WebController {
         return newsService.addVisit(id);
     }
 
+    @ApiOperation(value = "博物馆信息")
+    @GetMapping("museum/info")
+    public Result museumInfo(){
+        return Result.success(museumInfoService.findById(1L));
+    }
+
+
+    @ApiOperation(value = "博物馆访问量")
+    @GetMapping("museum/getVisit")
+    public Result museumGetVisit(){
+        return museumInfoService.getVisitByModule("web");
+    }
+
 
+    @ApiOperation(value = "本馆资讯", notes = "type, news：新闻， info:信息， activity：活动")
+    @PostMapping("news/list")
+    public Result newsList(@RequestBody TypePageDto param){
+        return newsService.search(param);
+    }
+
+
+    @ApiOperation(value = "展览资讯", notes = "type, 状态， unstart:未开始， start:开始， end:结束")
+    @PostMapping("exhibition/list")
+    public Result exhibitionList(@RequestBody TypePageDto param){
+        return exhibitionService.search(param);
+    }
+
+
+    @ApiOperation(value = "典藏")
+    @PostMapping("goods/list")
+    public Result goodsList(@RequestBody GoodsPageDto param){
+        return goodsService.search(param);
+    }
 
+    @ApiOperation(value = "活动列表", notes = "type: 类型, online:线上， volunteer：志愿者")
+    @PostMapping("activity/list")
+    public Result activityList(@RequestBody TypePageDto param){
+        return activityService.search(param);
+    }
+
+
+    @ApiOperation(value = "服务-留言列表")
+    @PostMapping("comment/list")
+    public Result commentList(@RequestBody PageDateDto param){
+        return commentService.search(param, 1);
+    }
+
+    @ApiOperation(value = "服务-留言")
+    @PostMapping("comment/save")
+    public Result commentSave(@Valid @RequestBody CommentDto param){
+        CommentEntity entity = new CommentEntity();
+        BeanUtils.copyProperties(param, entity);
+        // 默认不显示
+        entity.setDisplay(0);
+        commentService.save(entity);
+        return Result.success();
+    }