史馆动态基本完成

gis_domain/src/main/java/com/gis/domain/request/CommentRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

gis_domain/src/main/java/com/gis/domain/request/DeptRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -0,0 +1,35 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class FodderDto {
+
+    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
+    private Long id;
+
+    @NotBlank(message = "名称不能为空")
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @NotBlank(message = "类型不能为空")
+    @ApiModelProperty(value = "类型：1：图片， 2：视频" , required = true)
+    private Integer type;
+
+    @ApiModelProperty(value = "高清图url")
+    private String img;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+}

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

@@ -0,0 +1,20 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class FodderPageDto extends PageDto{
+
+    @NotBlank(message = "类型不能为空")
+    @ApiModelProperty(value = "类型：1：图片， 2：视频" , required = true)
+    private Integer type;
+
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class GoodsDto {
+
+    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
+    private Long id;
+
+    @NotBlank(message = "标题不能为空")
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @NotNull(message = "类型不能为空")
+    @ApiModelProperty(value = "类型：1：图片， 2：视频，3：模型" , required = true)
+    private Integer type;
+
+//    @ApiModelProperty(value = "高清图url")
+//    private String img;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+    @ApiModelProperty(value = "文件id")
+    private String fileIds;
+
+}

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

@@ -0,0 +1,26 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class GoodsPageDateDto extends PageDateDto {
+
+    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
+    private Integer status;
+
+    @ApiModelProperty(value = "状态，1：审核通过，0：待审核")
+    private Integer auditStatus;
+
+    @NotNull(message = "类型不能为空")
+    @ApiModelProperty(value = "类型：1：图片， 2：视频，3：模型" , required = true)
+    private Integer type;
+
+
+}

gis_domain/src/main/java/com/gis/domain/request/LoginRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

gis_domain/src/main/java/com/gis/domain/request/MenuRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/NewsPageDateRequest.java

@@ -1,16 +1,13 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * Created by owen on 2020/5/9 0009 12:20
  */
 @Data
-public class NewsPageDateRequest extends PageDateRequest {
+public class NewsPageDateRequest extends PageDateDto {
 
     @ApiModelProperty(value = "类型，news:新闻， notice：公告" )
     private String type;

gis_domain/src/main/java/com/gis/domain/request/NewsRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/request/PageDateRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * 有时间
  */
 @Data
-public class PageDateRequest extends PageRequest {
+public class PageDateDto extends PageDto {
 
     /**
      * 开始时间

gis_domain/src/main/java/com/gis/domain/request/PageRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
  * Created by Owen on 2019/10/28 0028 12:24
  */
 @Data
-public class PageRequest {
+public class PageDto {
 
 
     @ApiModelProperty(value = "起始页码，默认1为第一页", name = "pageNum")

gis_domain/src/main/java/com/gis/domain/request/PasswordRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

gis_domain/src/main/java/com/gis/domain/request/RoleAccreditRequest.java

@@ -1,9 +1,8 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Set;
 

gis_domain/src/main/java/com/gis/domain/request/RoleRequest.java

@@ -1,10 +1,9 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/5/9 0009 12:20

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

@@ -0,0 +1,16 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class SpiritPageDateDto extends PageDateDto {
+
+    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过", required = true)
+    private Integer status;
+
+
+}

gis_domain/src/main/java/com/gis/domain/request/SpiritRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +19,7 @@ public class SpiritRequest {
     @ApiModelProperty(value = "标题", required = true )
     private String title;
 
-    @ApiModelProperty(value = "简介")
+    @ApiModelProperty(value = "归属单位")
     private String unit;
 
     @ApiModelProperty(value = "高清图url")

gis_domain/src/main/java/com/gis/domain/request/UserRequest.java

@@ -1,4 +1,4 @@
-package com.gis.domain.request;
+package com.gis.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

gis_domain/src/main/java/com/gis/domain/entity/CommentEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/FileEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,6 +28,11 @@ public class FileEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "缩略图url")
     private String thumb;
 
+    @ApiModelProperty(value = "封面图，1：是，0：否")
+    private Integer cover;
+
+    @ApiModelProperty(value = "外键id")
+    private String fkId;
 
 
 }

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

@@ -0,0 +1,39 @@
+package com.gis.domain.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 场景素材，图片、视频
+ */
+@Data
+@Table(name = "tb_fodder")
+public class FodderEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -8093446477844493946L;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型：1：图片， 2：视频")
+    private Integer type;
+
+    @ApiModelProperty(value = "高清图url")
+    private String img;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,56 @@
+package com.gis.domain.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 精品典藏表
+ */
+@Data
+@Table(name = "tb_goods")
+public class GoodsEntity extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -8093446477843493946L;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "类型：1：图片， 2：视频，3：模型" )
+    private Integer type;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+//    @ApiModelProperty(value = "高清图url")
+//    private String img;
+
+
+    @ApiModelProperty(value = "阅读量")
+    private Integer viewCount;
+
+
+    @ApiModelProperty(value = "是否显示，1：是， 0：否")
+    private Integer display;
+
+    @ApiModelProperty(value = "提交用户Id")
+    private Long submitId;
+
+    @ApiModelProperty(value = "审核者Id")
+    private Long auditId;
+
+    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
+    private Integer status;
+
+    @ApiModelProperty(value = "原因")
+    private String reason;
+
+
+//    @ApiModelProperty(value = "文件ids")
+//    private String fileIds;
+
+
+
+}

gis_domain/src/main/java/com/gis/domain/entity/MenuEntity.java

@@ -1,9 +1,8 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
 

gis_domain/src/main/java/com/gis/domain/entity/NewsEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/SceneEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/SpiritEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/SysDeptEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

gis_domain/src/main/java/com/gis/domain/entity/SysResourceEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;

gis_domain/src/main/java/com/gis/domain/entity/SysRoleEntity.java

@@ -1,9 +1,8 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;

gis_domain/src/main/java/com/gis/domain/entity/SysUserEntity.java

@@ -1,4 +1,4 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +18,7 @@ public class SysUserEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -853504493430501564L;
 
-    @ApiModelProperty(value = "用户名")
+    @ApiModelProperty(value = "身份证号（军号）")
     private String userName;
 
     @JSONField(serialize = false)
@@ -27,20 +27,17 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "真实姓名")
     private String realName;
 
-//    @ApiModelProperty(value = "用户编号")
-//    private Integer userNum;
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
 
     @ApiModelProperty(value = "性别 0:男  1：女")
     private Integer sex;
 
-    @ApiModelProperty(value = "邮箱")
+    @ApiModelProperty(value = "电话")
     private String phone;
 
-    @ApiModelProperty(value = "状态 0:启用  1：停用 2：注销")
-    private Integer status;
-
-    @ApiModelProperty(value = "邮箱")
-    private String email;
+    @ApiModelProperty(value = "单位")
+    private String unit;
 
     @ApiModelProperty(value = "部门id")
     private Long deptId;
@@ -48,10 +45,14 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "超级管理员，1：是， 0：否")
     private Integer sysManager;
 
-//    @JSONField(serialize = false)
-//    @ApiModelProperty(value = "登录次数")
-//    private Integer viewCount;
+    @ApiModelProperty(value = "状态 1:启用  0：停用 ")
+    private Integer status;
+
+    @ApiModelProperty(value = "高清图url")
+    private String img;
 
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
 
 
 

gis_domain/src/main/java/com/gis/domain/entity/ViewEntity.java

@@ -1,10 +1,9 @@
-package com.gis.domain.entity;
+package com.gis.domain.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
 
 /**
  * Created by owen on 2020/6/10 0010 17:39

gis_domain/src/main/java/com/gis/domain/vo/GoodsVo.java

@@ -0,0 +1,42 @@
+package com.gis.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class GoodsVo {
+
+    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "标题" )
+    private String title;
+
+    @ApiModelProperty(value = "高清图url")
+    private String img;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+    @ApiModelProperty(value = "是否显示，1：是， 0：否")
+    private Integer display;
+
+    @ApiModelProperty(value = "类型：1：图片， 2：视频，3：模型")
+    private Integer type;
+
+    @ApiModelProperty(value = "提交用户Id")
+    private Long submitId;
+
+    @ApiModelProperty(value = "提交者名称")
+    private String submitName;
+
+    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
+    private Integer status;
+
+    @ApiModelProperty(value = "原因")
+    private String reason;
+
+}

gis_domain/src/main/java/com/gis/domain/response/NewsVo.java

@@ -1,11 +1,8 @@
-package com.gis.domain.response;
+package com.gis.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * Created by owen on 2020/5/9 0009 12:20
  */

gis_domain/src/main/java/com/gis/domain/vo/SpiritVo.java

@@ -0,0 +1,45 @@
+package com.gis.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class SpiritVo {
+
+    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "标题" )
+    private String title;
+
+    @ApiModelProperty(value = "归属单位")
+    private String unit;
+
+    @ApiModelProperty(value = "高清图url")
+    private String img;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+    @ApiModelProperty(value = "是否显示，1：是， 0：否")
+    private Integer display;
+
+    @ApiModelProperty(value = "信息正文")
+    private String content;
+
+    @ApiModelProperty(value = "提交用户Id")
+    private Long submitId;
+
+    @ApiModelProperty(value = "提交者名称")
+    private String submitName;
+
+    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
+    private Integer status;
+
+    @ApiModelProperty(value = "原因")
+    private String reason;
+
+}

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

@@ -1,8 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.CommentEntity;
-import com.gis.domain.entity.MenuEntity;
+import com.gis.domain.po.CommentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

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

@@ -1,8 +1,14 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
+import com.gis.mapper.provider.FileProvider;
+import com.gis.mapper.provider.SpiritProvider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Component;
 
 
@@ -10,5 +16,10 @@ import org.springframework.stereotype.Component;
 @Mapper
 public interface FileMapper extends IBaseMapper<FileEntity, Long> {
 
+//    @Modifying
+//    @Update(value = "UPDATE tb_file SET fk_id = #{fkId} WHERE id in ( #{ids} )")
+//    void setFkIdByIds(String ids, String fkId);
 
+    @SelectProvider(type = FileProvider.class, method = "search")
+    void setFkIdByIds(String ids, String fkId);
 }

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

@@ -0,0 +1,21 @@
+package com.gis.mapper;
+
+
+import com.gis.domain.dto.SpiritPageDateDto;
+import com.gis.domain.po.FodderEntity;
+import com.gis.domain.po.SpiritEntity;
+import com.gis.domain.vo.SpiritVo;
+import com.gis.mapper.provider.SpiritProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface FodderMapper extends IBaseMapper<FodderEntity, Long> {
+
+//    @SelectProvider(type = SpiritProvider.class, method = "search")
+//    List<SpiritVo> search(SpiritPageDateDto param);
+}

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

@@ -0,0 +1,22 @@
+package com.gis.mapper;
+
+
+import com.gis.domain.dto.GoodsPageDateDto;
+import com.gis.domain.po.FodderEntity;
+import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.GoodsVo;
+import com.gis.mapper.provider.GoodsProvider;
+import com.gis.mapper.provider.SpiritProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface GoodsMapper extends IBaseMapper<GoodsEntity, Long> {
+
+    @SelectProvider(type = GoodsProvider.class, method = "search")
+    List<GoodsVo> search(GoodsPageDateDto param);
+}

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

@@ -1,6 +1,6 @@
 package com.gis.mapper;
 
-import com.gis.domain.entity.BaseEntity;
+import com.gis.domain.po.BaseEntity;
 import tk.mybatis.mapper.common.BaseMapper;
 import tk.mybatis.mapper.common.ConditionMapper;
 import tk.mybatis.mapper.common.IdsMapper;

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

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.MenuEntity;
+import com.gis.domain.po.MenuEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

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

@@ -1,9 +1,9 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.NewsEntity;
-import com.gis.domain.request.NewsPageDateRequest;
-import com.gis.domain.response.NewsVo;
+import com.gis.domain.po.NewsEntity;
+import com.gis.domain.dto.NewsPageDateRequest;
+import com.gis.domain.vo.NewsVo;
 import com.gis.mapper.provider.NewsProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;

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

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.po.SceneEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

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

@@ -0,0 +1,20 @@
+package com.gis.mapper;
+
+
+import com.gis.domain.dto.SpiritPageDateDto;
+import com.gis.domain.po.SpiritEntity;
+import com.gis.domain.vo.SpiritVo;
+import com.gis.mapper.provider.SpiritProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface SpiritMapper extends IBaseMapper<SpiritEntity, Long> {
+
+    @SelectProvider(type = SpiritProvider.class, method = "search")
+    List<SpiritVo> search(SpiritPageDateDto param);
+}

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

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysDeptEntity;
+import com.gis.domain.po.SysDeptEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

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

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

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

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysRoleEntity;
+import com.gis.domain.po.SysRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

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

@@ -1,14 +1,11 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.SysUserEntity;
+import com.gis.domain.po.SysUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 @Component
 @Mapper
 public interface SysUserMapper extends IBaseMapper<SysUserEntity, Long> {

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

@@ -1,7 +1,7 @@
 package com.gis.mapper;
 
 
-import com.gis.domain.entity.ViewEntity;
+import com.gis.domain.po.ViewEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

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

@@ -0,0 +1,32 @@
+package com.gis.mapper.provider;
+
+import com.gis.domain.dto.GoodsPageDateDto;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/6/13 0013 10:56
+ */
+@Log4j2
+public class FileProvider {
+
+
+    public String search(String ids, String fkId){
+        StringBuffer sql = new StringBuffer(
+                        "UPDATE tb_file SET");
+
+        if (fkId != null) {
+            sql.append(" fk_id = '").append(fkId).append("'");
+        }
+
+        if (ids != null) {
+            sql.append("  WHERE id in ( ").append(ids).append(" )");
+        }
+
+
+
+//        sql.append(" order by a.create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.gis.mapper.provider;
+
+import com.gis.domain.dto.GoodsPageDateDto;
+import com.gis.domain.dto.SpiritPageDateDto;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/6/13 0013 10:56
+ */
+@Log4j2
+public class GoodsProvider {
+
+
+    public String search(GoodsPageDateDto param){
+        StringBuffer sql = new StringBuffer(
+                "select a.id, a.title, a.type, a.img, a.thumb, a.display, a.view_count, a.status, a.reason," +
+                        "a.submit_id, b.real_name as submit_name from tb_goods a left join sys_user b on b.id = a.submit_id where a.rec_status = 'A' ");
+
+        if(StringUtils.isNotBlank(param.getStartTime()) ){
+
+            sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
+
+        }
+
+        if (StringUtils.isNotBlank(param.getEndTime())) {
+            sql.append(" and a.create_time <= ").append("'").append(param.getEndTime()).append("'");
+        }
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and ( a.title like '%").append(searchKey).append("%' )");
+        }
+
+
+        /**
+         * 待审核,0：草稿中、待审核、审核不通过
+         * 审核通过,1：审核通过
+         */
+        Integer auditStatus = param.getAuditStatus();
+
+        if (auditStatus != null) {
+
+            if (auditStatus == 0) {
+                sql.append(" and a.status <> ").append(4);
+            } else {
+                sql.append(" and a.status = ").append(4);
+            }
+        }
+
+
+        Integer status = param.getStatus();
+        if (status != null) {
+            sql.append(" and a.status = ").append(status);
+        }
+
+        Integer type = param.getType();
+        if (type != null) {
+            sql.append(" and a.type = ").append(type);
+        }
+
+
+        sql.append(" order by a.create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.gis.mapper.provider;
 
-import com.gis.domain.request.NewsPageDateRequest;
-import com.gis.domain.request.PageDateRequest;
+import com.gis.domain.dto.NewsPageDateRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 
@@ -14,7 +13,7 @@ public class NewsProvider {
 
     public String search(NewsPageDateRequest param){
         StringBuffer sql = new StringBuffer(
-                "select a.id, a.type, a.title, a.description, a.img, a.thumb, a.display, a.content, a.view_count, a.status, a.reason," +
+                "select a.id, a.type, a.title, a.description, a.img, a.thumb, a.display, a.view_count, a.status, a.reason," +
                         "a.submit_id, b.real_name as submit_name from tb_news a left join sys_user b on b.id = a.submit_id where a.rec_status = 'A' ");
 
         if(StringUtils.isNotBlank(param.getStartTime()) ){
@@ -37,8 +36,6 @@ public class NewsProvider {
             sql.append(" and a.type = ").append(type);
         }
 
-        // 待审核：草稿中、待审核、审核不通过
-        // 审核通过：审核通过
         /**
          * 待审核：草稿中、待审核、审核不通过
          * 审核通过：审核通过

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

@@ -0,0 +1,51 @@
+package com.gis.mapper.provider;
+
+import com.gis.domain.dto.SpiritPageDateDto;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/6/13 0013 10:56
+ */
+@Log4j2
+public class SpiritProvider {
+
+
+    public String search(SpiritPageDateDto param){
+        StringBuffer sql = new StringBuffer(
+                "select a.id, a.title, a.unit, a.img, a.thumb, a.display, a.view_count, a.status, a.reason," +
+                        "a.submit_id, b.real_name as submit_name from tb_spirit a left join sys_user b on b.id = a.submit_id where a.rec_status = 'A' ");
+
+        if(StringUtils.isNotBlank(param.getStartTime()) ){
+
+            sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
+
+        }
+
+        if (StringUtils.isNotBlank(param.getEndTime())) {
+            sql.append(" and a.create_time <= ").append("'").append(param.getEndTime()).append("'");
+        }
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and ( a.title like '%").append(searchKey).append("%' )");
+        }
+
+
+        /**
+         * 待审核：草稿中、待审核、审核不通过
+         * 审核通过：审核通过
+         */
+        Integer status = param.getStatus();
+
+        if (status == 4) {
+            sql.append(" and a.status = ").append(status);
+        } else {
+            sql.append(" and a.status <> ").append(4);
+        }
+
+        sql.append(" order by a.create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.CommentEntity;
+import com.gis.domain.po.CommentEntity;
 
 
 /**

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 
 /**
  * Created by owen on 2020/5/11 0011 16:14
@@ -9,5 +9,5 @@ import com.gis.domain.entity.FileEntity;
 public interface FileService extends IBaseService<FileEntity, Long> {
 
 
-
+    void setFkIdByIds(String ids, String fkId);
 }

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

@@ -0,0 +1,19 @@
+package com.gis.service;
+
+
+import com.gis.domain.dto.SpiritPageDateDto;
+import com.gis.domain.po.FodderEntity;
+import com.gis.domain.po.SpiritEntity;
+import com.gis.domain.vo.SpiritVo;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface FodderService extends IBaseService<FodderEntity, Long> {
+
+
+//    List<SpiritVo> search(SpiritPageDateDto param);
+}

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

@@ -0,0 +1,19 @@
+package com.gis.service;
+
+
+import com.gis.domain.dto.GoodsPageDateDto;
+import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.GoodsVo;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface GoodsService extends IBaseService<GoodsEntity, Long> {
+
+    List<GoodsVo> search(GoodsPageDateDto param);
+
+
+}

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.MenuEntity;
+import com.gis.domain.po.MenuEntity;
 
 
 /**

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

@@ -1,9 +1,9 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.NewsEntity;
-import com.gis.domain.request.NewsPageDateRequest;
-import com.gis.domain.response.NewsVo;
+import com.gis.domain.po.NewsEntity;
+import com.gis.domain.dto.NewsPageDateRequest;
+import com.gis.domain.vo.NewsVo;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.po.SceneEntity;
 
 
 /**

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

@@ -0,0 +1,18 @@
+package com.gis.service;
+
+
+import com.gis.domain.dto.SpiritPageDateDto;
+import com.gis.domain.po.SpiritEntity;
+import com.gis.domain.vo.SpiritVo;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface SpiritService extends IBaseService<SpiritEntity, Long> {
+
+
+    List<SpiritVo> search(SpiritPageDateDto param);
+}

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysDeptEntity;
+import com.gis.domain.po.SysDeptEntity;
 
 
 /**

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 import com.gis.service.util.ResourceTree;
 
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysRoleEntity;
+import com.gis.domain.po.SysRoleEntity;
 
 
 /**

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

@@ -1,9 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.SysUserEntity;
-
-import java.util.List;
+import com.gis.domain.po.SysUserEntity;
 
 
 /**

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

@@ -1,7 +1,7 @@
 package com.gis.service;
 
 
-import com.gis.domain.entity.ViewEntity;
+import com.gis.domain.po.ViewEntity;
 
 
 /**

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.CommentEntity;
+import com.gis.domain.po.CommentEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.CommentMapper;
 import com.gis.service.CommentService;

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 import com.gis.mapper.FileMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.FileService;
@@ -23,5 +23,8 @@ public class FileServiceImpl extends IBaseServiceImpl<FileEntity, Long> implemen
     }
 
 
-
+    @Override
+    public void setFkIdByIds(String ids, String fkId) {
+        entityMapper.setFkIdByIds(ids, fkId);
+    }
 }

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

@@ -0,0 +1,29 @@
+package com.gis.service.impl;
+
+import com.gis.domain.po.FodderEntity;
+import com.gis.mapper.FodderMapper;
+import com.gis.mapper.IBaseMapper;
+import com.gis.service.FodderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by owen on 2020/7/15 0015 16:46
+ */
+@Service
+public  class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> implements FodderService {
+
+    @Autowired
+    private FodderMapper entityMapper;
+
+    @Override
+    public IBaseMapper<FodderEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+    //    @Override
+    //    public List<FodderVo> search(FodderPageDateDto param) {
+    //        return entityMapper.search(param);
+    //    }
+}

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

@@ -0,0 +1,34 @@
+package com.gis.service.impl;
+
+import com.gis.domain.dto.GoodsPageDateDto;
+import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.GoodsVo;
+import com.gis.mapper.IBaseMapper;
+import com.gis.mapper.GoodsMapper;
+import com.gis.service.GoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:16
+ */
+@Service
+public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implements GoodsService {
+
+    @Autowired
+    private GoodsMapper entityMapper;
+
+    @Override
+    public IBaseMapper<GoodsEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+    @Override
+    public List<GoodsVo> search(GoodsPageDateDto param) {
+        return entityMapper.search(param);
+    }
+}

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

@@ -3,7 +3,7 @@ package com.gis.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gis.mapper.IBaseMapper;
-import com.gis.domain.entity.BaseEntity;
+import com.gis.domain.po.BaseEntity;
 import com.gis.service.IBaseService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.MenuEntity;
+import com.gis.domain.po.MenuEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.MenuMapper;
 import com.gis.service.MenuService;

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

@@ -1,8 +1,8 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.NewsEntity;
-import com.gis.domain.request.NewsPageDateRequest;
-import com.gis.domain.response.NewsVo;
+import com.gis.domain.po.NewsEntity;
+import com.gis.domain.dto.NewsPageDateRequest;
+import com.gis.domain.vo.NewsVo;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.NewsMapper;
 import com.gis.service.NewsService;

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.po.SceneEntity;
 import com.gis.mapper.SceneMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.SceneService;

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

@@ -0,0 +1,34 @@
+package com.gis.service.impl;
+
+import com.gis.domain.dto.SpiritPageDateDto;
+import com.gis.domain.po.SpiritEntity;
+import com.gis.domain.vo.SpiritVo;
+import com.gis.mapper.IBaseMapper;
+import com.gis.mapper.SpiritMapper;
+import com.gis.service.SpiritService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:16
+ */
+@Service
+public class SpiritServiceImpl extends IBaseServiceImpl<SpiritEntity, Long> implements SpiritService {
+
+    @Autowired
+    private SpiritMapper entityMapper;
+
+    @Override
+    public IBaseMapper<SpiritEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+    @Override
+    public List<SpiritVo> search(SpiritPageDateDto param) {
+        return entityMapper.search(param);
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysDeptEntity;
+import com.gis.domain.po.SysDeptEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysDeptMapper;
 import com.gis.service.SysDeptService;

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

@@ -1,8 +1,11 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.FodderEntity;
+import com.gis.domain.po.SysResourceEntity;
+import com.gis.mapper.FodderMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysResourceMapper;
+import com.gis.service.FodderService;
 import com.gis.service.SysResourceService;
 import com.gis.service.util.ResourceTree;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,4 +38,6 @@ public class SysResourceServiceImpl extends IBaseServiceImpl<SysResourceEntity,
     public List<SysResourceEntity> findResourceByRoleId(Long roleId) {
         return entityMapper.findResourceByRoleId(roleId);
     }
+
+
 }

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysRoleEntity;
+import com.gis.domain.po.SysRoleEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysRoleMapper;
 import com.gis.service.SysRoleService;

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

@@ -1,14 +1,12 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.SysUserEntity;
+import com.gis.domain.po.SysUserEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysUserMapper;
 import com.gis.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 
 /**
  * Created by owen on 2020/3/11 0011 16:16

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

@@ -1,6 +1,6 @@
 package com.gis.service.impl;
 
-import com.gis.domain.entity.ViewEntity;
+import com.gis.domain.po.ViewEntity;
 import com.gis.mapper.ViewMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.ViewService;

gis_service/src/main/java/com/gis/service/util/CommentTreeUtil.java

@@ -1,7 +1,6 @@
 package com.gis.service.util;
 
-import com.gis.domain.entity.CommentEntity;
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.CommentEntity;
 
 import java.util.ArrayList;
 import java.util.List;

gis_service/src/main/java/com/gis/service/util/MenuTreeUtil.java

@@ -1,8 +1,7 @@
 package com.gis.service.util;
 
-import com.gis.domain.entity.MenuEntity;
-import com.gis.domain.entity.SysResourceEntity;
-import org.springframework.stereotype.Component;
+import com.gis.domain.po.MenuEntity;
+import com.gis.domain.po.SysResourceEntity;
 
 import java.util.ArrayList;
 import java.util.List;

gis_service/src/main/java/com/gis/service/util/ResourceTreeUtil.java

@@ -1,6 +1,6 @@
 package com.gis.service.util;
 
-import com.gis.domain.entity.SysResourceEntity;
+import com.gis.domain.po.SysResourceEntity;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -12,13 +12,12 @@ import com.gis.common.proto.util.CreateObjUtil;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.RandomUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.po.SceneEntity;
 import com.gis.service.SceneService;
 import com.gis.web.shiro.JwtUtil;
 import io.swagger.annotations.*;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.event.spi.SaveOrUpdateEvent;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ResourceUtils;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;

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

@@ -1,11 +1,12 @@
 package com.gis.web.controller;
 
-import com.gis.domain.entity.SysUserEntity;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.service.FileService;
 import com.gis.service.SysUserService;
 import com.gis.web.shiro.JwtUtil;
 import com.github.pagehelper.PageHelper;
 
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -22,6 +23,10 @@ public class BaseController {
     @Autowired
     public SysUserService sysUserService;
 
+
+    @Autowired
+    public FileService fileService;
+
     /**
      * 服务器保存文件路径前缀
      */
@@ -72,7 +77,7 @@ public class BaseController {
     /**
      * 设置请求分页数据
      */
-    void startPage(PageRequest param){
+    void startPage(PageDto param){
         Integer pageNum = param.getPageNum();
         Integer pageSize = param.getPageSize();
         if (pageNum == null) {

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

@@ -1,14 +1,12 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.CommentEntity;
-import com.gis.domain.request.CommentRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.CommentEntity;
+import com.gis.domain.dto.CommentRequest;
+import com.gis.domain.dto.PageDto;
 import com.gis.service.CommentService;
 import com.gis.service.util.CommentTree;
 import com.gis.service.util.CommentTreeUtil;
-import com.gis.service.util.MenuTree;
-import com.gis.service.util.MenuTreeUtil;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,7 +33,7 @@ public class CommentController extends BaseController {
 
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<CommentTree> list(@RequestBody PageRequest param) {
+    public Result<CommentTree> list(@RequestBody PageDto param) {
         startPage(param);
 
         List<CommentEntity> all = commentService.findAll();

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

@@ -3,18 +3,15 @@ package com.gis.web.controller;
 
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
-import com.gis.common.util.AliyunOssUtil;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.FileEntity;
+import com.gis.domain.po.FileEntity;
 import com.gis.service.FileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -142,5 +139,14 @@ public class FileController extends BaseController {
 
 
 
+    @ApiOperation("设置封面")
+    @GetMapping("setCover/ids")
+    public Result setCover(@PathVariable String ids) {
+
+
+        return Result.success();
+    }
+
+
 
 }

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

@@ -0,0 +1,97 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.FodderDto;
+import com.gis.domain.dto.FodderPageDto;
+import com.gis.domain.po.FodderEntity;
+import com.gis.service.FodderService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ * Created by owen on 2020/5/8 0008 9:54
+ */
+@Log4j2
+@Api(tags = "场景素材")
+@RestController
+@RequestMapping("manage/fodder")
+public class FodderController extends BaseController {
+
+    @Autowired
+    private FodderService fodderService;
+
+
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public Result<FodderEntity> list(@RequestBody FodderPageDto param) {
+
+        startPage(param);
+        Condition condition = new Condition(FodderEntity.class);
+        condition.and().andEqualTo("type", param.getType());
+
+        PageInfo<FodderEntity> page = new PageInfo<>(fodderService.findAll(condition));
+        return Result.success(page);
+    }
+
+    @ApiOperation("新增/修改部信息")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody FodderDto param) {
+
+        FodderEntity entity = null;
+        if (param.getId() == null) {
+            entity = new FodderEntity();
+            BeanUtils.copyProperties(param, entity);
+            fodderService.save(entity);
+        } else {
+            entity = fodderService.findById(param.getId());
+            if (entity == null) {
+                return Result.failure("对象id不存在");
+            }
+
+            BeanUtils.copyProperties(param, entity);
+            entity.setUpdateTime(new Date());
+            fodderService.update(entity);
+
+        }
+
+        return Result.success();
+    }
+
+
+    /**
+     * 素材文件，真删除
+     */
+    @ApiOperation("删除")
+    @GetMapping("removes/{ids}")
+    public Result detail(@PathVariable String ids) {
+
+
+        return Result.success();
+    }
+
+
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        FodderEntity entity = fodderService.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 ： {}", id);
+            return Result.failure("对象id不存在");
+        }
+        return Result.success(entity);
+    }
+
+
+
+}

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

@@ -0,0 +1,119 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.GoodsDto;
+import com.gis.domain.dto.GoodsPageDateDto;
+import com.gis.domain.po.FileEntity;
+import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.GoodsVo;
+import com.gis.service.GoodsService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by owen on 2020/5/8 0008 9:54
+ */
+@Log4j2
+@Api(tags = "精品典藏")
+@RestController
+@RequestMapping("manage/goods")
+public class GoodsController extends BaseController {
+
+    @Autowired
+    private GoodsService goodsService;
+
+
+
+
+    @ApiOperation(value = "列表", notes = "auditStatus和status不能同时提交")
+    @PostMapping("list")
+    public Result<GoodsVo> list(@RequestBody GoodsPageDateDto param) {
+
+        startPage(param);
+
+        PageInfo<GoodsVo> page = new PageInfo<>(goodsService.search(param));
+        return Result.success(page);
+    }
+
+    @ApiOperation("新增/修改部信息")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody GoodsDto param) {
+
+        GoodsEntity entity = null;
+        if (param.getId() == null) {
+            entity = new GoodsEntity();
+            BeanUtils.copyProperties(param, entity);
+            goodsService.save(entity);
+
+            // 图片信息跟goodsId绑定
+            String fkId= "goods_" + entity.getId();
+
+            fileService.setFkIdByIds(param.getFileIds(), fkId);
+
+        } else {
+            entity = goodsService.findById(param.getId());
+            if (entity == null) {
+                return Result.failure("对象id不存在");
+            }
+
+            BeanUtils.copyProperties(param, entity);
+            entity.setUpdateTime(new Date());
+            goodsService.update(entity);
+
+        }
+
+        return Result.success();
+    }
+
+
+    /**
+     * 素材文件，真删除
+     */
+    @ApiOperation("删除")
+    @GetMapping("removes/{ids}")
+    public Result detail(@PathVariable String ids) {
+
+
+        return Result.success();
+    }
+
+
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        GoodsEntity entity = goodsService.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 ： {}", id);
+            return Result.failure("对象id不存在");
+        }
+
+//        List<FileEntity> fileList = new ArrayList<>();
+
+//        String fileIds = entity.getFileIds();
+//        if (StringUtils.isNotBlank(fileIds)) {
+//            fileList = fileService.findByIds(fileIds);
+//        }
+//
+//        HashMap<Object, Object> result = new HashMap<>();
+//        result.put("entity", entity);
+//        result.put("file", fileList);
+
+        return Result.success(entity);
+    }
+
+
+
+}

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

@@ -3,8 +3,8 @@ package com.gis.web.controller;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.PasswordUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.LoginRequest;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.LoginRequest;
 import com.gis.service.SysUserService;
 import com.gis.web.shiro.JwtUtil;
 import io.swagger.annotations.Api;
@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,11 +1,9 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.MenuEntity;
-import com.gis.domain.entity.SysDeptEntity;
-import com.gis.domain.request.DeptRequest;
-import com.gis.domain.request.MenuRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.MenuEntity;
+import com.gis.domain.dto.MenuRequest;
+import com.gis.domain.dto.PageDto;
 import com.gis.service.MenuService;
 import com.gis.service.util.MenuTree;
 import com.gis.service.util.MenuTreeUtil;
@@ -15,10 +13,8 @@ import io.swagger.annotations.ApiOperation;
 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.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -37,7 +33,7 @@ public class MenuController extends BaseController {
 
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<MenuEntity> list(@RequestBody PageRequest param) {
+    public Result<MenuEntity> list(@RequestBody PageDto param) {
         startPage(param);
         PageInfo<MenuEntity> page = new PageInfo<>(menuService.findAll());
         return Result.success(page);

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

@@ -1,11 +1,10 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.NewsEntity;
-import com.gis.domain.request.NewsPageDateRequest;
-import com.gis.domain.request.NewsRequest;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.response.NewsVo;
+import com.gis.domain.po.NewsEntity;
+import com.gis.domain.dto.NewsPageDateRequest;
+import com.gis.domain.dto.NewsRequest;
+import com.gis.domain.vo.NewsVo;
 import com.gis.service.NewsService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by owen on 2020/5/8 0008 9:54
@@ -70,10 +70,20 @@ public class NewsController extends BaseController {
     }
 
 
+    /**
+     * 软删除，db保留记录
+     */
     @ApiOperation("删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {
-        newsService.deleteByIds(ids);
+
+        List<NewsEntity> entities = newsService.findByIds(ids);
+        for (NewsEntity entity: entities) {
+            entity.setRecStatus("I");
+            entity.setUpdateTime(new Date());
+            newsService.update(entity);
+        }
+
         return Result.success();
     }
 

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

@@ -0,0 +1,120 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.SpiritPageDateDto;
+import com.gis.domain.po.SpiritEntity;
+import com.gis.domain.dto.SpiritRequest;
+import com.gis.domain.vo.SpiritVo;
+import com.gis.service.SpiritService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by owen on 2020/5/8 0008 9:54
+ */
+@Log4j2
+@Api(tags = "特有精神")
+@RestController
+@RequestMapping("manage/spirit")
+public class SpiritController extends BaseController {
+
+    @Autowired
+    private SpiritService spiritService;
+
+
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public Result<SpiritVo> list(@RequestBody SpiritPageDateDto param) {
+
+        Long userId = getTokenUserId();
+
+        startPage(param);
+        PageInfo<SpiritVo> page = new PageInfo<>(spiritService.search(param));
+        return Result.success(page);
+    }
+
+    @ApiOperation("新增/修改部信息")
+    @PostMapping("save")
+    public Result save(@Valid @RequestBody SpiritRequest param) {
+
+        SpiritEntity entity = null;
+        if (param.getId() == null) {
+            entity = new SpiritEntity();
+            BeanUtils.copyProperties(param, entity);
+            entity.setSubmitId(getTokenUserId());
+            entity.setStatus(1);
+            spiritService.save(entity);
+        } else {
+            entity = spiritService.findById(param.getId());
+            if (entity == null) {
+                return Result.failure("对象id不存在");
+            }
+
+            BeanUtils.copyProperties(param, entity);
+            entity.setUpdateTime(new Date());
+            spiritService.update(entity);
+
+        }
+
+        return Result.success();
+    }
+
+
+    /**
+     * 软删除，db保留记录
+     */
+    @ApiOperation("删除")
+    @GetMapping("removes/{ids}")
+    public Result detail(@PathVariable String ids) {
+
+        List<SpiritEntity> entities = spiritService.findByIds(ids);
+        for (SpiritEntity entity: entities) {
+            entity.setRecStatus("I");
+            entity.setUpdateTime(new Date());
+            spiritService.update(entity);
+        }
+
+        return Result.success();
+    }
+
+
+    @ApiOperation("审核")
+    @GetMapping("audit/{id}/{status}")
+    public Result audit(@PathVariable Long id, @PathVariable Integer status) {
+        SpiritEntity entity = spiritService.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 ： {}", id);
+            return Result.failure("对象id不存在");
+        }
+
+        entity.setStatus(status);
+        entity.setAuditId(getTokenUserId());
+        spiritService.update(entity);
+        return Result.success();
+    }
+
+
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result detail(@PathVariable Long id) {
+        SpiritEntity entity = spiritService.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 ： {}", id);
+            return Result.failure("对象id不存在");
+        }
+        return Result.success(entity);
+    }
+
+
+
+}

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

@@ -2,19 +2,16 @@ package com.gis.web.controller;
 
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysDeptEntity;
-import com.gis.domain.request.DeptRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.SysDeptEntity;
+import com.gis.domain.dto.DeptRequest;
+import com.gis.domain.dto.PageDto;
 import com.gis.service.SysDeptService;
-import com.gis.service.SysUserService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -36,7 +33,7 @@ public class SysDeptController extends BaseController {
 
     @ApiOperation("部门列表")
     @PostMapping("list")
-    public Result<SysDeptEntity> list(@RequestBody PageRequest param) {
+    public Result<SysDeptEntity> list(@RequestBody PageDto param) {
         startPage(param);
         PageInfo<SysDeptEntity> page = new PageInfo<>(sysDeptService.findAll());
         return Result.success(page);

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

@@ -2,16 +2,10 @@ package com.gis.web.controller;
 
 
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysResourceEntity;
-import com.gis.domain.entity.SysRoleEntity;
-import com.gis.domain.request.RoleAccreditRequest;
-import com.gis.domain.request.RoleRequest;
-import com.gis.domain.request.PageRequest;
+import com.gis.domain.po.SysRoleEntity;
+import com.gis.domain.dto.RoleRequest;
 import com.gis.service.SysResourceService;
 import com.gis.service.SysRoleService;
-import com.gis.service.util.ResourceTree;
-import com.gis.service.util.ResourceTreeUtil;
-import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
@@ -19,16 +13,10 @@ import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 
 
 /**

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

@@ -3,12 +3,10 @@ package com.gis.web.controller;
 
 import com.gis.common.util.PasswordUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SysRoleEntity;
-import com.gis.domain.entity.SysUserEntity;
-import com.gis.domain.request.PageRequest;
-import com.gis.domain.request.PasswordRequest;
-import com.gis.domain.request.UserRequest;
-import com.gis.service.SysRoleService;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.dto.PageDto;
+import com.gis.domain.dto.PasswordRequest;
+import com.gis.domain.dto.UserRequest;
 import com.gis.service.SysUserService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -20,7 +18,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -48,7 +45,7 @@ public class SysUserController extends BaseController {
     @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
     @ApiOperation("用户列表")
     @PostMapping("list")
-    public Result<SysUserEntity> list(@RequestBody PageRequest param) {
+    public Result<SysUserEntity> list(@RequestBody PageDto param) {
         startPage(param);
         PageInfo<SysUserEntity> page = new PageInfo<>(userService.findAll());
         return Result.success(page);

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

@@ -1,38 +1,16 @@
 package com.gis.web.controller;
 
 
-import cn.hutool.core.io.FileUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.gis.common.constant.TypeCode;
-import com.gis.common.exception.BaseRuntimeException;
-import com.gis.common.proto.constant.ConstantCmd;
-import com.gis.common.proto.constant.ConstantFileName;
-import com.gis.common.proto.util.CreateObjUtil;
-import com.gis.common.util.FileUtils;
-import com.gis.common.util.RandomUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.entity.SceneEntity;
-import com.gis.domain.entity.ViewEntity;
-import com.gis.service.SceneService;
+import com.gis.domain.po.ViewEntity;
 import com.gis.service.ViewService;
-import com.gis.web.shiro.JwtUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Created by owen on 2020/6/10 0010 10:44

gis_web/src/main/java/com/gis/web/shiro/MyRealm.java

@@ -1,8 +1,8 @@
 package com.gis.web.shiro;
 
 import com.gis.common.exception.JwtAuthenticationException;
-import com.gis.domain.entity.SysRoleEntity;
-import com.gis.domain.entity.SysUserEntity;
+import com.gis.domain.po.SysRoleEntity;
+import com.gis.domain.po.SysUserEntity;
 import com.gis.service.SysRoleService;
 import com.gis.service.SysUserService;
 import lombok.extern.log4j.Log4j2;

help.md

@@ -21,4 +21,19 @@
             - data2.js(java生成的空json)
             - someData.json(java生成)
             - xxx_50k.dan(java生成)
-        
+
+
+
+# 需求确认：
+
+1. 系统管理员，是可以看所有数据，还是只可以看系统管理的数据？
+2. 系统管理员是直接添加用户是就给，还是数据库后台手动给
+3. 系统管理员账户可以删除吗？
+4. 是有一个系统管理员，还是多个？
+
+5. 精品典藏的数据管理
+
+    列表：
+        缩略图应该是同一个
+    
+