去除无用代码

gis_common/pom.xml

@@ -38,12 +38,6 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <!-- rabbit MQ-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-starter-amqp</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -110,18 +104,18 @@
         </dependency>
 
         <!--aliyun sdk-->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.aliyun</groupId>-->
+            <!--<artifactId>aliyun-java-sdk-core</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.aliyun</groupId>-->
+            <!--<artifactId>aliyun-java-sdk-dysmsapi</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.aliyun.oss</groupId>-->
+            <!--<artifactId>aliyun-sdk-oss</artifactId>-->
+        <!--</dependency>-->
 
 
         <!--tk.mybatis 依赖-->
@@ -138,19 +132,8 @@
         </dependency>
 
 
-        <!-- 钉钉sdk -->
-        <!--<dependency>-->
-            <!--<groupId>com.dingtalk.open</groupId>-->
-            <!--<artifactId>taobao-sdk-java-auto</artifactId>-->
-        <!--</dependency>-->
 
 
-        <!--excel 依赖工具包， hutool需要用的-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.poi</groupId>-->
-            <!--<artifactId>poi-ooxml</artifactId>-->
-        <!--</dependency>-->
-
         <!-- 针对proto包 转换格式用-->
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -181,11 +164,6 @@
             <version>2.5.1</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>io.gitbub.wnjustdoit</groupId>-->
-            <!--<artifactId>pinyin4j</artifactId>-->
-            <!--&lt;!&ndash;<version>1.0.0</version>&ndash;&gt;-->
-        <!--</dependency>-->
 
 
     </dependencies>

gis_common/src/main/java/com/gis/common/config/CommonInterceptor.java

@@ -1,56 +0,0 @@
-package com.gis.common.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@Component
-public class CommonInterceptor implements HandlerInterceptor {
-
-    @Value("${spring.profiles.active}")
-    private String active;
-
-    @Override
-    public boolean preHandle(HttpServletRequest request,
-                             HttpServletResponse response, Object handler) throws Exception {
-        if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
-                && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
-                && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
-        }
-
-
-        // uat环境禁止访问api文档
-        if (active.equals("pro")) {
-            return !request.getRequestURI().contains("doc.html");
-        }
-
-        return true;
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request,
-                           HttpServletResponse response, Object handler,
-                           ModelAndView modelAndView) throws Exception {
-        request.setAttribute("ctx", request.getContextPath());
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request,
-                                HttpServletResponse response, Object handler, Exception ex)
-            throws Exception {
-        if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
-                && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
-                && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
-        }
-    }
-
-
-
-
-}

gis_common/src/main/java/com/gis/common/config/WebMvcConfig.java

@@ -21,9 +21,6 @@ import java.util.List;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    @Autowired
-    private CommonInterceptor commonInterceptor;
-
     /**
      * 配置全局跨域
      */
@@ -37,14 +34,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
     }
 
 
-    /**
-     * 添加拦截器
-     */
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(commonInterceptor).addPathPatterns("/**");
-    }
-
 
     /**
      * fastJson相关设置
@@ -77,9 +66,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
         return new HttpMessageConverters(fastJson);
     }
 
-//    @Bean
-//    public DriverMangerListener driverMangerListener(){
-//       return new DriverMangerListener();
-//    }
+
 
 }

gis_common/src/main/java/com/gis/common/proto/util/ConvertUtils.java

@@ -159,61 +159,4 @@ public class ConvertUtils {
         }
     }
 
-//    public static void convertTxtToVisionmodeldata(String srcpath,String despath)throws Exception
-//    {
-//        try
-//        {
-//            Visionmodeldata.NavigationInfo.Builder builder = Visionmodeldata.NavigationInfo.newBuilder();
-//            String jsonFormat = readTxtFileToJson(srcpath);
-//            JsonFormat.merge(jsonFormat, builder);
-//            byte[] buf= builder.build().toByteArray();
-//
-//            //把序列化后的数据写入本地磁盘
-//            ByteArrayInputStream stream = new ByteArrayInputStream(buf);
-//            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(despath));//设置输出路径
-//            BufferedInputStream bis = new BufferedInputStream(stream);
-//            int b = -1;
-//            while ((b = bis.read()) != -1) {
-//                bos.write(b);
-//            }
-//            bis.close();
-//            bos.close();
-//        }
-//        catch(Exception e)
-//        {
-//            StringWriter trace=new StringWriter();
-//            e.printStackTrace(new PrintWriter(trace));
-//            log.error(trace.toString());
-//        }
-//    }
-
-//    public static void convertVisionmodeldataToTxt(String srcpath,String despath)throws Exception
-//    {
-//        try
-//        {
-//            File file = new File(srcpath);
-//            FileInputStream fis=new FileInputStream(file);
-//
-//            Visionmodeldata.NavigationInfo data_NavigationInfo = Visionmodeldata.NavigationInfo.parseFrom(fis);
-//
-//            //PrintStream out = new PrintStream(despath);
-//            String jsonFormat1 = JsonFormat.printToString(data_NavigationInfo);
-//            ByteArrayInputStream stream = new ByteArrayInputStream(jsonFormat1.getBytes());
-//            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(despath));//设置输出路径
-//            BufferedInputStream bis = new BufferedInputStream(stream);
-//            int b = -1;
-//            while ((b = bis.read()) != -1) {
-//                bos.write(b);
-//            }
-//            //out.close();
-//            bis.close();
-//            bos.close();
-//        }
-//        catch(Exception e)
-//        {
-//            StringWriter trace=new StringWriter();
-//            e.printStackTrace(new PrintWriter(trace));
-//            log.error(trace.toString());
-//        }
-//    }
 }

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

@@ -1,235 +0,0 @@
-package com.gis.common.util;
-
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.model.OSSObject;
-import com.aliyun.oss.model.OSSObjectSummary;
-import com.aliyun.oss.model.ObjectListing;
-import com.aliyun.oss.model.PutObjectResult;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 阿里云oss工具类
- */
-@Slf4j
-public class AliyunOssUtil {
-
-
-    private static final String END_POINT = "http://oss-cn-shenzhen.aliyuncs.com";
-	private static final String ACCESS_KEY_ID = "LTAIUrvuHqj8pvry";
-	private static final String ACCESS_KEY_SECREY = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";
-	private static final String BUCKET_NAME = "4dkankan";
-
-	// 加载对象
-	private static OSSClient ossClient = new OSSClient(END_POINT, ACCESS_KEY_ID, ACCESS_KEY_SECREY);
-    
-
-    
-    public static void delete(String key) throws IOException{
-    	  try {
-    		  
-            // 2019-2-28 启动aliyun oss 空间
-          	ossClient.deleteObject(BUCKET_NAME, key);
-          } catch (Exception e) {
-              e.printStackTrace();
-          }
-    }
-    
-    //上传的数据是byte[]，key是上传后的文件名
-    public void upload(byte[] data,String key) throws IOException{  
-    	try 
-    	{  
-    		// 2019-2-28 启动aliyun oss 空间
-        	ossClient.putObject(BUCKET_NAME, key, new ByteArrayInputStream(data));
-        } catch (Exception e) {
-        	log.error(e.toString()+key); 
-        }
-    }  
-    
-   
-	public static void upload(String filePath, String key) {
-		try {
-			File file = new File(filePath);
-			if (!file.exists()) {
-				log.error("要上传的文件不存在：" + filePath);
-			}
-			ossClient.putObject(BUCKET_NAME, key, new File(filePath));
-
-		} catch (Exception e) {
-			log.error(e.toString() + filePath);
-		}
-	}
-    
-	public static void upload2(String filePath, String key) {
-		try {
-			
-			// 2019-2-28 启动aliyun oss 空间
-			ossClient.putObject(BUCKET_NAME , key, new File(filePath));
-		} catch (Exception e) {
-			log.error(e.toString() + filePath);
-		}
-	}
-    
-
-	/**
-	 * 上传的数据是文件夹，参数是文件夹路径，key是上传后的文件名
-	 * @param filepaths
-	 * key : 原文件路径
-	 * value： oss路径， oss会自动创建目录
-	 */
-	public static void uploadMulFiles(Map<String, String> filepaths) {
-		if (filepaths == null) {
-			return;
-		}
-		log.info("开始批量上传到阿里云：" + new Date().toString());
-		if (filepaths.size() > 50) {
-			for (String filePath : filepaths.keySet()) {
-				upload2(filePath, filepaths.get(filePath));
-			}
-		} else {
-			for (String filePath : filepaths.keySet()) {
-				log.info("文件：" + filePath + "到阿里云：" + filepaths.get(filePath));
-				upload(filePath, filepaths.get(filePath));
-			}
-		}
-		log.info("批量上传阿里云完毕：" + new Date().toString());
-	}
-
-
-	/**
-	 * 可以删除目录
-	 * @param prefix 图片路径
-	 * @return
-	 */
-	public static int deleteFile(String prefix){
-
-		ObjectListing objectListing = ossClient.listObjects(BUCKET_NAME, prefix);
-		List<OSSObjectSummary> sums = objectListing.getObjectSummaries();
-		try {
-			for (OSSObjectSummary s : sums) {
-				delete(s.getKey());
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	    return sums.size();  
-	}
-	
-	public static void main(String[] args) throws IOException {
-
-		HashMap<String, String> map = new HashMap<>();
-//		map.put("F:\\test\\aa.jpg", "kanfang/test/aa.jpg");
-		map.put("F:\\test\\oss\\floor.json", "kanfang/test/faa.json");
-		uploadMulFiles(map);
-
-//		deleteFile("kanfang/test/aa.jpg");
-
-    }
-
-
-	public static String upload5(String filePath, String key) {
-		PutObjectResult result = null;
-		try {
-			File file = new File(filePath);
-			if (!file.exists()) {
-				log.error("要上传的文件不存在：" + filePath);
-			}
-
-
-			 result = ossClient.putObject(BUCKET_NAME, key, new File(filePath));
-
-		} catch (Exception e) {
-			log.error(e.toString() + filePath);
-		}
-
-		log.info(" getETag : " + result.getETag());
-		log.info("1 : " + result.toString());
-		log.info("2 : " + result.getRequestId());
-		log.info("3 : " + result.getClientCRC());
-		log.info("4 : " + result.getResponse());
-		log.info("5 : " + result.getServerCRC());
-		return result.getETag();
-	}
-
-
-    /**
-     * 通过文件名判断并获取OSS服务文件上传时文件的contentType
-     * @param fileName 文件名
-     * @return 文件的contentType
-     */
-    private static String getContentType(String fileName) {
-        log.info("getContentType:" + fileName);
-        // 文件的后缀名
-        String fileExtension = fileName.substring(fileName.lastIndexOf("."));
-        if (".bmp".equalsIgnoreCase(fileExtension)) {
-            return "image/bmp";
-        }
-        if (".gif".equalsIgnoreCase(fileExtension)) {
-            return "image/gif";
-        }
-        if (".jpeg".equalsIgnoreCase(fileExtension) || ".jpg".equalsIgnoreCase(fileExtension)
-                || ".png".equalsIgnoreCase(fileExtension)) {
-            return "image/jpeg";
-        }
-        if (".html".equalsIgnoreCase(fileExtension)) {
-            return "text/html";
-        }
-        if (".txt".equalsIgnoreCase(fileExtension)) {
-            return "text/plain";
-        }
-        if (".vsd".equalsIgnoreCase(fileExtension)) {
-            return "application/vnd.visio";
-        }
-        if (".ppt".equalsIgnoreCase(fileExtension) || "pptx".equalsIgnoreCase(fileExtension)) {
-            return "application/vnd.ms-powerpoint";
-        }
-        if (".doc".equalsIgnoreCase(fileExtension) || "docx".equalsIgnoreCase(fileExtension)) {
-            return "application/msword";
-        }
-        if (".xml".equalsIgnoreCase(fileExtension)) {
-            return "text/xml";
-        }
-        if (".pdf".equalsIgnoreCase(fileExtension)) {
-            return "application/pdf";
-        }
-        // 默认返回类型
-        return "image/jpeg";
-    }
-
-    /**
-     * 以流下载图片
-	 * @Title: getInputStreamByFileUrl
-     * @Description: 根据文件路径获取InputStream流
-     * @param
-     * @return
-     * @return: InputStream
-     */
-    public static InputStream getInputStreamByFileUrl(String filePath) {
-        // ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
-        OSSObject ossObject = ossClient.getObject(BUCKET_NAME, filePath);
-        return ossObject.getObjectContent();
-    }
-
-
-	/**
-	 * 生成图片
-	 * @param inputFilePath
-	 * @param savePath
-	 */
-//	public static void writeFile(String inputFilePath, String savePath){
-//		try {
-//			FileUtils.bigFileWrite(getInputStreamByFileUrl(inputFilePath), savePath);
-//		} catch (IOException e) {
-//			e.printStackTrace();
-//		}
-//	}
-
-}

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

@@ -1,27 +0,0 @@
-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 AuditDto {
-
-    @NotNull(message = "id不能为空")
-    @ApiModelProperty(value = "id" , required = true)
-    private Long id;
-
-    @ApiModelProperty(value = "原因")
-    private String reason;
-
-    @NotNull(message = "类型不能为空")
-    @ApiModelProperty(value = "审核状态：3：审核不通过，4：审核通过" , required = true)
-    private Integer status;
-
-
-}

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

@@ -12,8 +12,6 @@ import javax.validation.constraints.NotNull;
 @Data
 public class CommentRequest {
 
-//    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
-//    private Long id;
 
     @NotBlank(message = "留言人")
     @ApiModelProperty(value = "留言人", required = true)
@@ -26,7 +24,5 @@ public class CommentRequest {
     @ApiModelProperty(value = "父级id")
     private Long parentId;
 
-//    @NotNull(message = "显示设置不能为空")
-//    @ApiModelProperty(value = "是否显示，1：是， 0：否", required = true)
-//    private Integer display;
+
 }

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

@@ -23,11 +23,7 @@ public class FodderDto {
     @ApiModelProperty(value = "类型：1：图片， 2：视频, 3: 模型" , required = true)
     private Integer type;
 
-//    @ApiModelProperty(value = "文件url")
-//    private String fileUrl;
-//
-//    @ApiModelProperty(value = "文件名称")
-//    private String fileName;
+
 
     @ApiModelProperty(value = "缩略图url")
     private String thumb;

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

@@ -1,31 +0,0 @@
-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 MenuRequest {
-
-    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
-    private Long id;
-
-    @NotBlank(message = "名称不能为空")
-    @ApiModelProperty(value = "名称", required = true)
-    private String name;
-
-    @NotNull(message = "排序不能为空")
-    @ApiModelProperty(value = "排序", required = true)
-    private Integer sort;
-
-    @ApiModelProperty(value = "父级id")
-    private Long parentId;
-
-    @ApiModelProperty(value = "类型：1：图片， 2：视频，3：模型, 0：默认类型")
-    private Integer type;
-}

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

@@ -1,50 +0,0 @@
-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 NewsRequest {
-
-    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
-    private Long id;
-
-
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "类型，news:新闻， notice：公告", required = true )
-    private String type;
-
-    @NotBlank(message = "标题不能为空")
-    @ApiModelProperty(value = "标题", required = true )
-    private String title;
-
-    @ApiModelProperty(value = "简介")
-    private String description;
-
-    @ApiModelProperty(value = "高清图url")
-    private String img;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @NotNull(message = "显示设置不能为空")
-    @ApiModelProperty(value = "是否显示，1：是， 0：否", required = true)
-    private Integer display;
-
-    @ApiModelProperty(value = "信息正文")
-    private String content;
-
-    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
-    private Integer status;
-
-    @NotBlank(message = "作者不能为空")
-    @ApiModelProperty(value = "作者", required = true)
-    private String author;
-
-}

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

@@ -1,26 +0,0 @@
-package com.gis.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.util.Set;
-
-/**
- * Created by owen on 2020/5/9 0009 12:20
- * 角色授权
- */
-@Data
-public class RoleAccreditRequest {
-
-    @NotNull(message = "角色Id不能为空")
-    @ApiModelProperty(value = "roleId", required = true)
-    private Long id;
-
-    @ApiModelProperty(value = "角色描述")
-    private String roleDesc;
-
-    @NotNull(message = "权限不能为空")
-    @ApiModelProperty(value = "资源id, 多个id用“，”隔开，例如：1,2,3", required = true)
-    private Set<Long> resources;
-}

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

@@ -1,30 +0,0 @@
-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 RoleRequest {
-
-    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
-    private Long id;
-
-//    @NotBlank(message = "角色key不能为空")
-//    @ApiModelProperty(value = "角色key", required = true)
-//    private String roleKey;
-
-    @NotBlank(message = "角色key不能为空")
-    @ApiModelProperty(value = "角色名称", required = true)
-    private String roleName;
-
-    @ApiModelProperty(value = "角色描述")
-    private String roleDesc;
-
-    @ApiModelProperty(value = "数据范围，1：所有数据，2：部门数据，3：个人数据")
-    private Integer dataScope ;
-}

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

@@ -1,36 +0,0 @@
-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 SlideshowDto {
-
-    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
-    private Long id;
-
-    @NotBlank(message = "标题不能为空")
-    @ApiModelProperty(value = "标题", required = true )
-    private String title;
-
-    @ApiModelProperty(value = "场景url")
-    private String webSite;
-
-    @ApiModelProperty(value = "高清图url")
-    private String img;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
-    private Integer status;
-
-}

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

@@ -1,47 +0,0 @@
-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
-SpiritRequest {
-
-    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
-    private Long id;
-
-    @NotBlank(message = "标题不能为空")
-    @ApiModelProperty(value = "标题", required = true )
-    private String title;
-
-    @ApiModelProperty(value = "归属单位")
-    private String unit;
-
-    @ApiModelProperty(value = "高清图url")
-    private String img;
-
-    @ApiModelProperty(value = "缩略图url")
-    private String thumb;
-
-    @NotNull(message = "显示设置不能为空")
-    @ApiModelProperty(value = "是否显示，1：是， 0：否", required = true)
-    private Integer display;
-
-    @ApiModelProperty(value = "信息正文")
-    private String content;
-
-    @ApiModelProperty(value = "状态，1：草稿中，2：待审核，3：审核不通过，4：审核通过")
-    private Integer status;
-
-    @NotBlank(message = "作者不能为空")
-    @ApiModelProperty(value = "作者", required = true)
-    private String author;
-
-
-}

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

@@ -1,31 +0,0 @@
-package com.gis.mapper;
-
-
-import com.gis.domain.po.CommentEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 公共mapper
- */
-@Component
-@Mapper
-public interface CommonMapper extends IBaseMapper<CommentEntity, Long> {
-
-    @Select(value = "select * from tb_topic where rec_status = 'A' ")
-    List<Map> getTopic();
-
-    @Update(value = "update tb_topic set display = 1 where id = #{id} ")
-    void setTopic(Long id);
-
-    @Update(value = "update tb_topic set display = 0 ")
-    void setAllDisable();
-
-    @Select(value = "select * from tb_topic where rec_status = 'A' AND display = 1 ")
-    Map getActivityTopic();
-}

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

@@ -1,12 +0,0 @@
-package com.gis.mapper;
-
-
-import com.gis.domain.po.MenuEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-@Component
-@Mapper
-public interface MenuMapper extends IBaseMapper<MenuEntity, Long> {
-
-}

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

@@ -1,24 +0,0 @@
-package com.gis.mapper;
-
-
-import com.gis.domain.dto.SlideshowPageDateDto;
-import com.gis.domain.po.SlideshowEntity;
-import com.gis.domain.vo.SlideshowVo;
-import com.gis.mapper.provider.SlideshowProvider;
-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 SlideshowMapper extends IBaseMapper<SlideshowEntity, Long> {
-
-    @SelectProvider(type = SlideshowProvider.class, method = "search")
-    List<SlideshowVo> search(SlideshowPageDateDto param, Long userId);
-
-    @Select("SELECT * FROM tb_slideshow where status = #{status} and display = #{display} and rec_status = 'A'")
-    List<SlideshowVo> showDisplay(Integer status, Integer display);
-}

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

@@ -1,30 +0,0 @@
-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.Select;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
-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, Long userId);
-
-    @Update("update tb_spirit set view_count = view_count + 1 where id = #{id} ")
-    void setView(Long id);
-
-    @Select("select a.id, a.title, a.unit, a.img, a.thumb, a.display, a.content, a.view_count, a.sort, " +
-            "a.author, a.status, a.reason, a.create_time, a.update_time," +
-            "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'  AND a.display = 1 and a.status = 4 order by a.create_time desc ")
-    List<SpiritVo> findDisplay();
-}

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

@@ -1,57 +0,0 @@
-package com.gis.mapper.provider;
-
-import com.gis.domain.dto.SlideshowPageDateDto;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Created by owen on 2020/6/13 0013 10:56
- */
-@Log4j2
-public class SlideshowProvider {
-
-
-    public String search(SlideshowPageDateDto param, Long userId){
-        StringBuffer sql = new StringBuffer(
-                "select a.id, a.title, a.img, a.thumb, a.web_site, a.status, a.reason, a.sort, a.display, a.create_time, a.update_time, " +
-                        "a.submit_id, b.real_name as submit_name from tb_slideshow 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("%' )");
-        }
-
-        if (userId != null) {
-            sql.append(" and a.submit_id = ").append(userId);
-        }
-
-
-        /**
-         * 列表专用
-         * 待审核,5：草稿中、待审核、审核不通过
-         *
-         */
-        Integer status = param.getStatus();
-        if (status == 5) {
-            sql.append(" and a.status <> ").append(4);
-        } else {
-            sql.append(" and a.status = ").append(status);
-
-        }
-
-
-        sql.append(" order by a.display desc, a.sort asc, a.create_time desc");
-        log.info("sql: {}", sql.toString());
-        return sql.toString();
-    }
-}

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

@@ -1,62 +0,0 @@
-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, Long userId){
-        StringBuffer sql = new StringBuffer(
-                "select a.id, a.title, a.unit, a.img, a.thumb, a.display, a.content, a.view_count, a.status, a.sort," +
-                        "a.author, a.reason, a.create_time, a.update_time," +
-                        "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("%' )");
-        }
-
-        if(userId != null){
-            sql.append(" and a.submit_id = ").append(userId);
-        }
-
-
-        /**
-         * 列表专用
-         * 待审核,5：草稿中、待审核、审核不通过
-         *
-         */
-        Integer status = param.getStatus();
-        if (status == 5) {
-            sql.append(" and a.status <> ").append(4);
-        } else {
-            sql.append(" and a.status = ").append(status);
-
-        }
-
-        if (status == 4) {
-            sql.append(" order by a.display desc, a.create_time desc");
-        } else {
-
-            sql.append(" order by a.create_time desc");
-        }
-        log.info("sql: {}", sql.toString());
-        return sql.toString();
-    }
-}

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

@@ -1,13 +0,0 @@
-package com.gis.service;
-
-
-import com.gis.domain.po.MenuEntity;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:14
- */
-public interface MenuService extends IBaseService<MenuEntity, Long> {
-
-
-}

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

@@ -1,21 +0,0 @@
-package com.gis.service;
-
-
-import com.gis.domain.dto.SlideshowPageDateDto;
-import com.gis.domain.po.SlideshowEntity;
-import com.gis.domain.vo.SlideshowVo;
-
-import java.util.List;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:14
- */
-public interface SlideshowService extends IBaseService<SlideshowEntity, Long> {
-
-
-    List<SlideshowVo> search(SlideshowPageDateDto param, Long userId);
-
-
-    List<SlideshowVo> showDisplay(Integer status, Integer display);
-}

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

@@ -1,22 +0,0 @@
-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, Long userId);
-
-    void setView(Long id);
-
-    List<SpiritVo> findDisplay();
-}

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

@@ -15,7 +15,7 @@ public interface SysUserService extends IBaseService<SysUserEntity, Long> {
 
     SysUserEntity findByUserName(String userName);
 
-    SysUserEntity findByPhone(String phone);
+
 
     List<SysUserEntity> search(UserPageDateDto param);
 

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

@@ -1,27 +0,0 @@
-package com.gis.service.impl;
-
-import com.gis.domain.po.MenuEntity;
-import com.gis.mapper.IBaseMapper;
-import com.gis.mapper.MenuMapper;
-import com.gis.service.MenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:16
- */
-@Service
-public class MenuServiceImpl extends IBaseServiceImpl<MenuEntity, Long> implements MenuService {
-
-    @Autowired
-    private MenuMapper entityMapper;
-
-    @Override
-    public IBaseMapper<MenuEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
-
-
-}

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

@@ -1,39 +0,0 @@
-package com.gis.service.impl;
-
-import com.gis.domain.dto.SlideshowPageDateDto;
-import com.gis.domain.po.SlideshowEntity;
-import com.gis.domain.vo.SlideshowVo;
-import com.gis.mapper.IBaseMapper;
-import com.gis.mapper.SlideshowMapper;
-import com.gis.service.SlideshowService;
-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 SlideshowServiceImpl extends IBaseServiceImpl<SlideshowEntity, Long> implements SlideshowService {
-
-    @Autowired
-    private SlideshowMapper entityMapper;
-
-
-    @Override
-    public IBaseMapper<SlideshowEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
-    @Override
-    public List<SlideshowVo> search(SlideshowPageDateDto param, Long userId) {
-        return entityMapper.search(param, userId);
-    }
-
-    @Override
-    public List<SlideshowVo> showDisplay(Integer status, Integer display) {
-        return entityMapper.showDisplay(status, display);
-    }
-}

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

@@ -1,44 +0,0 @@
-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, Long userId) {
-        return entityMapper.search(param, userId);
-    }
-
-    @Override
-    public void setView(Long id) {
-        entityMapper.setView(id);
-    }
-
-    @Override
-    public List<SpiritVo> findDisplay() {
-        return entityMapper.findDisplay();
-    }
-}

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

@@ -30,10 +30,7 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
         return entityMapper.findByUserName(userName);
     }
 
-    @Override
-    public SysUserEntity findByPhone(String phone) {
-        return entityMapper.findByPhone(phone);
-    }
+
 
     @Override
     public List<SysUserEntity> search(UserPageDateDto param) {

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

@@ -1,96 +0,0 @@
-//package com.gis.web.controller;
-//
-//import com.gis.common.util.Result;
-//import com.gis.domain.po.MenuEntity;
-//import com.gis.domain.dto.MenuRequest;
-//import com.gis.domain.dto.PageDto;
-//import com.gis.domain.po.SysUserEntity;
-//import com.gis.service.MenuService;
-//import com.gis.service.util.MenuTree;
-//import com.gis.service.util.MenuTreeUtil;
-//import com.gis.web.aop.WebControllerLog;
-//import com.github.pagehelper.PageInfo;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//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.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
-// */
-//@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
-//@Api(tags = "s菜单管理")
-//@RestController
-//@RequestMapping("manage/menu")
-//public class MenuController extends BaseController {
-//
-//    @Autowired
-//    private MenuService menuService;
-//
-//
-//
-//    @ApiOperation("列表")
-//    @PostMapping("list")
-//    public Result<MenuEntity> list(@RequestBody PageDto param) {
-//        startPage(param);
-//        PageInfo<MenuEntity> page = new PageInfo<>(menuService.findAll());
-//        return Result.success(page);
-//    }
-//
-//    @WebControllerLog(description = "菜单管理-新增/修改")
-//    @ApiOperation("新增/修改")
-//    @PostMapping("save")
-//    public Result save(@Valid @RequestBody MenuRequest param) {
-//
-//        SysUserEntity userEntity = sysUserService.findByUserName(getTokenUserName());
-//
-//        MenuEntity entity = null;
-//        if (param.getId() == null) {
-//            entity = new MenuEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setEditName(userEntity.getNickName());
-//            menuService.save(entity);
-//        } else {
-//            entity = menuService.findById(param.getId());
-//            if (entity == null) {
-//                return Result.failure("对象id不存在");
-//            }
-//
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setEditName(userEntity.getNickName());
-//            entity.setUpdateTime(new Date());
-//            menuService.update(entity);
-//
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//    @WebControllerLog(description = "菜单管理-删除")
-//    @ApiOperation("删除")
-//    @GetMapping("removes/{ids}")
-//    public Result detail(@PathVariable String ids) {
-//        menuService.deleteByIds(ids);
-//
-//        return Result.success();
-//    }
-//
-//    @ApiOperation("获取菜单")
-//    @GetMapping("getMenu")
-//    public Result getMenu() {
-//        List<MenuEntity> entities = menuService.findAll();
-//
-//        MenuTreeUtil menuTreeUtil = new MenuTreeUtil(entities);
-//        List<MenuTree> tree = menuTreeUtil.buildTree();
-//
-//        return Result.success(tree);
-//    }
-//}

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

@@ -1,181 +0,0 @@
-//package com.gis.web.controller;
-//
-//import cn.hutool.core.io.FileUtil;
-//import com.gis.common.util.Result;
-//import com.gis.domain.dto.AuditDto;
-//import com.gis.domain.po.GoodsEntity;
-//import com.gis.domain.po.NewsEntity;
-//import com.gis.domain.dto.NewsPageDateRequest;
-//import com.gis.domain.dto.NewsRequest;
-//import com.gis.domain.po.SysUserEntity;
-//import com.gis.domain.vo.NewsVo;
-//import com.gis.service.NewsService;
-//import com.gis.web.aop.WebControllerLog;
-//import com.github.pagehelper.PageInfo;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.log4j.Log4j2;
-//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.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/news")
-//public class NewsController extends BaseController {
-//
-//    @Autowired
-//    private NewsService newsService;
-//
-//
-//
-//    @ApiOperation("列表")
-//    @PostMapping("list")
-//    public Result<NewsVo> list(@RequestBody NewsPageDateRequest param) {
-//
-//        SysUserEntity sysUser = getSysUser();
-//        startPage(param);
-//        List<NewsVo> search;
-//
-//        // 已审核
-//        if (param.getStatus() == 4) {
-//            search = newsService.search(param, null);
-//        // 待审核
-//        } else {
-//            if ("sys_normal".equals(sysUser.getRole())) {
-//                search = newsService.search(param, sysUser.getId());
-//            } else {
-//                search = newsService.search(param, null);
-//            }
-//        }
-//
-//        PageInfo<NewsVo> page = new PageInfo<>(search);
-//        return Result.success(page);
-//    }
-//
-//
-//    @WebControllerLog(description = "史馆动态-新增/修改")
-//    @ApiOperation("新增/修改")
-//    @PostMapping("save")
-//    public Result save(@Valid @RequestBody NewsRequest param) {
-//
-//        NewsEntity entity = null;
-//        if (param.getId() == null) {
-//            entity = new NewsEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setSubmitId(getTokenUserId());
-//            entity.setDisplay(1);
-////            entity.setStatus(1);
-//            newsService.save(entity);
-//        } else {
-//            entity = newsService.findById(param.getId());
-//            if (entity == null) {
-//                return Result.failure("对象id不存在");
-//            }
-//
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setUpdateTime(new Date());
-//            newsService.update(entity);
-//
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "史馆动态-删除")
-//    @ApiOperation("删除")
-//    @GetMapping("removes/{ids}")
-//    public Result removes(@PathVariable String ids) {
-//
-//        List<NewsEntity> entities = newsService.findByIds(ids);
-//        for (NewsEntity entity: entities) {
-//            deleteFile(entity.getImg());
-//            deleteFile(entity.getThumb());
-//            newsService.delete(entity);
-//
-////            entity.setRecStatus("I");
-////            entity.setUpdateTime(new Date());
-////            newsService.update(entity);
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "史馆动态-审核")
-//    @ApiOperation("审核")
-//    @PostMapping("audit")
-//    public Result audit(@Valid @RequestBody AuditDto param) {
-//        NewsEntity entity = newsService.findById(param.getId());
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", param.getId());
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setStatus(param.getStatus());
-//        entity.setAuditId(getTokenUserId());
-//        entity.setReason(param.getReason());
-//        newsService.update(entity);
-//        return Result.success();
-//    }
-//
-//
-//    @ApiOperation("详情")
-//    @GetMapping("detail/{id}")
-//    public Result detail(@PathVariable Long id) {
-//        NewsEntity entity = newsService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//        return Result.success(entity);
-//    }
-//
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "史馆动态-是否显示")
-//    @ApiOperation("是否显示")
-//    @GetMapping("display/{id}/{display}")
-//    public Result display(@PathVariable Long id, @PathVariable Integer display) {
-//        NewsEntity entity = newsService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setDisplay(display);
-//        newsService.update(entity);
-//        return Result.success();
-//    }
-//
-//    @ApiOperation("排序")
-//    @GetMapping("sort/{id}/{num}")
-//    public Result sort(@PathVariable Long id, @PathVariable Integer num) {
-//        NewsEntity entity = newsService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setSort(num);
-//        newsService.update(entity);
-//        return Result.success();
-//    }
-//
-//
-//
-//}

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

@@ -65,9 +65,6 @@ public class SceneController extends BaseController {
     @Autowired
     private SceneMapper sceneMapper;
 
-    @Autowired
-    private SysUserService sysUserService;
-
 
 
     @ApiOperation("场景列表")

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

@@ -1,220 +0,0 @@
-//package com.gis.web.controller;
-//
-//import cn.hutool.core.io.FileUtil;
-//import com.gis.common.util.Result;
-//import com.gis.domain.dto.AuditDto;
-//import com.gis.domain.dto.SlideshowDto;
-//import com.gis.domain.dto.SlideshowPageDateDto;
-//import com.gis.domain.po.NewsEntity;
-//import com.gis.domain.po.SlideshowEntity;
-//import com.gis.domain.po.SysUserEntity;
-//import com.gis.domain.vo.SlideshowVo;
-//import com.gis.domain.vo.SpiritVo;
-//import com.gis.service.SlideshowService;
-//import com.gis.web.aop.WebControllerLog;
-//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.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.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/slideshow")
-//public class SlideshowController extends BaseController {
-//
-//    @Autowired
-//    private SlideshowService slideshowService;
-//
-//
-//
-//    @ApiOperation("列表")
-//    @PostMapping("list")
-//    public Result<SlideshowVo> list(@RequestBody SlideshowPageDateDto param) {
-//
-//
-//        SysUserEntity sysUser = getSysUser();
-//        startPage(param);
-//        List<SlideshowVo> search;
-//
-//        // 已审核
-//        if (param.getStatus() == 4) {
-//            search = slideshowService.search(param, null);
-//            // 待审核
-//        } else {
-//            if ("sys_normal".equals(sysUser.getRole())) {
-//                search = slideshowService.search(param, sysUser.getId());
-//            } else {
-//                search = slideshowService.search(param, null);
-//            }
-//        }
-//
-//        PageInfo<SlideshowVo> page = new PageInfo<>(search);
-//        return Result.success(page);
-//    }
-//
-//    @WebControllerLog(description = "轮播图管理-新增/修改")
-//    @ApiOperation("新增/修改")
-//    @PostMapping("save")
-//    public Result save(@Valid @RequestBody SlideshowDto param) {
-//
-//        SlideshowEntity entity = null;
-//        if (param.getId() == null) {
-//            entity = new SlideshowEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setSubmitId(getTokenUserId());
-//            entity.setDisplay(1);
-//            slideshowService.save(entity);
-//        } else {
-//            entity = slideshowService.findById(param.getId());
-//            if (entity == null) {
-//                return Result.failure("对象id不存在");
-//            }
-//
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setUpdateTime(new Date());
-//            slideshowService.update(entity);
-//
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//    /**
-//     * 软删除，db保留记录
-//     */
-////    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-////    @WebControllerLog(description = "轮播图管理-删除")
-////    @ApiOperation("删除")
-////    @GetMapping("removes/{ids}")
-////    public Result detail(@PathVariable String ids) {
-////
-////        List<SlideshowEntity> entities = slideshowService.findByIds(ids);
-////        for (SlideshowEntity entity: entities) {
-//////            log.info("remove1 :{}", entity.getImg());
-//////            FileUtil.del(subStringAfter(entity.getImg()));
-//////            log.info("remove2 :{}", entity.getImg());
-//////            FileUtil.del(subStringAfter(entity.getThumb()));
-//////            log.info("remove3 ");
-////            slideshowService.delete(entity);
-////            log.info("remove4 删除db记录 ");
-////        }
-////
-////        return Result.success();
-////    }
-//
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "轮播图管理-删除")
-//    @ApiOperation("删除")
-//    @GetMapping("removes/{ids}")
-//    public Result detail(@PathVariable String ids) {
-//
-//        int n = 1;
-//        List<SlideshowEntity> entities = slideshowService.findByIds(ids);
-//        for (SlideshowEntity entity: entities) {
-//            String img = entity.getImg();
-//            log.info("imgPath: {}", img);
-//            deleteFile(img);
-//
-//            String thumb = entity.getThumb();
-//            log.info("thumbPath: {}", thumb);
-//            deleteFile(thumb);
-//
-//            slideshowService.delete(entity);
-//            log.info("删除db记录成功 ");
-//            log.info("n: {}", n+1);
-//
-////            entity.setRecStatus("I");
-////            entity.setUpdateTime(new Date());
-////            slideshowService.update(entity);
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//    public static void main(String[] args) {
-//        FileUtil.del("");
-//    }
-//
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "轮播图管理-审核")
-//    @ApiOperation("审核")
-//    @PostMapping("audit")
-//    public Result audit(@Valid @RequestBody AuditDto param) {
-//        SlideshowEntity entity = slideshowService.findById(param.getId());
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", param.getId());
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setStatus(param.getStatus());
-//        entity.setAuditId(getTokenUserId());
-//        entity.setReason(param.getReason());
-//        slideshowService.update(entity);
-//        return Result.success();
-//    }
-//
-//
-//    @ApiOperation("详情")
-//    @GetMapping("detail/{id}")
-//    public Result detail(@PathVariable Long id) {
-//        SlideshowEntity entity = slideshowService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//        return Result.success(entity);
-//    }
-//
-//
-//    @ApiOperation("排序")
-//    @GetMapping("sort/{id}/{num}")
-//    public Result sort(@PathVariable Long id, @PathVariable Integer num) {
-//        SlideshowEntity entity = slideshowService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setSort(num);
-//        slideshowService.update(entity);
-//        return Result.success();
-//    }
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "轮播图管理-是否显示")
-//    @ApiOperation("是否显示")
-//    @GetMapping("display/{id}/{display}")
-//    public Result display(@PathVariable Long id, @PathVariable Integer display) {
-//        SlideshowEntity entity = slideshowService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setDisplay(display);
-//        slideshowService.update(entity);
-//        return Result.success();
-//    }
-//
-//
-//
-//}

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

@@ -1,185 +0,0 @@
-//package com.gis.web.controller;
-//
-//import cn.hutool.core.io.FileUtil;
-//import com.gis.common.util.Result;
-//import com.gis.domain.dto.AuditDto;
-//import com.gis.domain.dto.SpiritPageDateDto;
-//import com.gis.domain.po.NewsEntity;
-//import com.gis.domain.po.SlideshowEntity;
-//import com.gis.domain.po.SpiritEntity;
-//import com.gis.domain.dto.SpiritRequest;
-//import com.gis.domain.po.SysUserEntity;
-//import com.gis.domain.vo.NewsVo;
-//import com.gis.domain.vo.SpiritVo;
-//import com.gis.service.SpiritService;
-//import com.gis.web.aop.WebControllerLog;
-//import com.github.pagehelper.PageInfo;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.log4j.Log4j2;
-//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.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) {
-//
-//        SysUserEntity sysUser = getSysUser();
-//        startPage(param);
-//        List<SpiritVo> search;
-//
-//        // 已审核
-//        if (param.getStatus() == 4) {
-//            search = spiritService.search(param, null);
-//            // 待审核
-//        } else {
-//            if ("sys_normal".equals(sysUser.getRole())) {
-//                search = spiritService.search(param, sysUser.getId());
-//            } else {
-//                search = spiritService.search(param, null);
-//            }
-//        }
-//
-//        PageInfo<SpiritVo> page = new PageInfo<>(search);
-//        return Result.success(page);
-//    }
-//
-//    @WebControllerLog(description = "特有精神-新增/修改")
-//    @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);
-//            entity.setDisplay(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保留记录
-//     */
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "特有精神-删除")
-//    @ApiOperation("删除")
-//    @GetMapping("removes/{ids}")
-//    public Result detail(@PathVariable String ids) {
-//
-//        List<SpiritEntity> entities = spiritService.findByIds(ids);
-//        for (SpiritEntity entity: entities) {
-//            deleteFile(entity.getImg());
-//            deleteFile(entity.getThumb());
-//            spiritService.delete(entity);
-////            entity.setRecStatus("I");
-////            entity.setUpdateTime(new Date());
-////            spiritService.update(entity);
-//
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "特有精神-审核")
-//    @ApiOperation("审核")
-//    @PostMapping("audit")
-//    public Result audit(@Valid @RequestBody AuditDto param) {
-//        SpiritEntity entity = spiritService.findById(param.getId());
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", param.getId());
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setStatus(param.getStatus());
-//        entity.setAuditId(getTokenUserId());
-//        entity.setReason(param.getReason());
-//        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);
-//    }
-//
-//    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
-//    @WebControllerLog(description = "特有精神-是否显示")
-//    @ApiOperation("是否显示")
-//    @GetMapping("display/{id}/{display}")
-//    public Result display(@PathVariable Long id, @PathVariable Integer display) {
-//        SpiritEntity entity = spiritService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setDisplay(display);
-//        spiritService.update(entity);
-//        return Result.success();
-//    }
-//
-//    @ApiOperation("排序")
-//    @GetMapping("sort/{id}/{num}")
-//    public Result sort(@PathVariable Long id, @PathVariable Integer num) {
-//        SpiritEntity entity = spiritService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        entity.setSort(num);
-//        spiritService.update(entity);
-//        return Result.success();
-//    }
-//
-//
-//
-//
-//}

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

@@ -1,54 +0,0 @@
-//package com.gis.web.controller;
-//
-//import com.gis.common.util.Result;
-//import com.gis.domain.dto.PageDto;
-//import com.gis.domain.po.SceneEntity;
-//import com.gis.mapper.CommonMapper;
-//import com.gis.service.SceneService;
-//import com.gis.web.aop.WebControllerLog;
-//import com.github.pagehelper.PageInfo;
-//import com.github.xiaoymin.knife4j.annotations.ApiSort;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.log4j.Log4j2;
-//import org.apache.shiro.authz.annotation.Logical;
-//import org.apache.shiro.authz.annotation.RequiresRoles;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-//
-///**
-// * Created by owen on 2020/5/8 0008 9:54
-// */
-//@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
-//@Log4j2
-//@Api(tags = "s主题管理", position = 1)
-//@RestController
-//@RequestMapping("manage/topic")
-//public class TopicController extends BaseController {
-//
-//    @Autowired
-//    private CommonMapper commonMapper;
-//
-//
-//
-//    @ApiOperation("获取主题")
-//    @GetMapping("get")
-//    public Result getTopic() {
-//        List<Map> topic = commonMapper.getTopic();
-//        return Result.success(topic);
-//    }
-//
-//    @WebControllerLog(description = "主题管理-设置主题")
-//    @ApiOperation("设置主题")
-//    @GetMapping("set/{id}")
-//    public Result setTopic(@PathVariable Long id) {
-//        commonMapper.setAllDisable();
-//        commonMapper.setTopic(id);
-//        return Result.success();
-//    }
-//
-//}

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

@@ -1,136 +0,0 @@
-//package com.gis.web.controller;
-//
-//import cn.hutool.core.io.FileUtil;
-//import com.gis.common.util.Result;
-//import com.gis.domain.dto.PageDto;
-//import com.gis.domain.dto.VideoDto;
-//import com.gis.domain.po.FileEntity;
-//import com.gis.domain.po.VideoEntity;
-//import com.gis.domain.vo.VideoVo;
-//import com.gis.mapper.VideoMapper;
-//import com.gis.service.VideoService;
-//import com.gis.web.aop.WebControllerLog;
-//import com.github.pagehelper.PageInfo;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.log4j.Log4j2;
-//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.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
-// */
-//@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
-//@Log4j2
-//@Api(tags = "大场景")
-//@RestController
-//@RequestMapping("manage/video")
-//public class VideoController extends BaseController {
-//
-//    @Autowired
-//    private VideoService videoService;
-//
-//    @Autowired
-//    private VideoMapper videoMapper;
-//
-//
-//
-//    @ApiOperation("视频列表")
-//    @PostMapping("list")
-//    public Result<VideoVo> list(@RequestBody PageDto param) {
-//
-//        startPage(param);
-//        PageInfo<VideoVo> page = new PageInfo<>(videoService.search(param));
-//        return Result.success(page);
-//    }
-//
-//    @WebControllerLog(description = "大场景-视频新增/修改")
-//    @ApiOperation("视频新增/修改")
-//    @PostMapping("save")
-//    public Result save(@Valid @RequestBody VideoDto param) {
-//
-//        VideoEntity entity = null;
-//        if (param.getId() == null) {
-//            entity = new VideoEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setSubmitId(getTokenUserId());
-//            videoService.save(entity);
-//        } else {
-//            entity = videoService.findById(param.getId());
-//            if (entity == null) {
-//                return Result.failure("对象id不存在");
-//            }
-//
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setUpdateTime(new Date());
-//            videoService.update(entity);
-//        }
-//
-//        return Result.success();
-//    }
-//
-//
-//    @WebControllerLog(description = "大场景-视频删除")
-//    @ApiOperation("视频删除")
-//    @GetMapping("removes/{ids}")
-//    public Result detail(@PathVariable String ids) {
-//        List<VideoEntity> entities = videoService.findByIds(ids);
-//        for (VideoEntity entity: entities) {
-////            entity.setRecStatus("I");
-////            entity.setUpdateTime(new Date());
-////            videoService.update(entity);
-//
-//            FileEntity file = fileService.findById(Long.valueOf(entity.getFileId()));
-//            FileUtil.del(file.getFilePath());
-////            deleteFile(entity.getImg());
-////            deleteFile(entity.getThumb());
-////            deleteFile(entity.getVideo());
-//            fileService.delete(file);
-//            videoService.delete(entity);
-//        }
-//        return Result.success();
-//    }
-//
-//
-//
-//    @ApiOperation("视频详情")
-//    @GetMapping("detail/{id}")
-//    public Result detail(@PathVariable Long id) {
-//        VideoEntity entity = videoService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//        return Result.success(entity);
-//    }
-//
-//
-//    /**
-//     * 只有一个视频是显示状态
-//     */
-//    @ApiOperation("视频显示")
-//    @GetMapping("display/{id}")
-//    public Result display(@PathVariable Long id) {
-//        VideoEntity entity = videoService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        // 把所有禁止
-//        videoMapper.setDisable();
-//        // 开启对应id
-//        videoMapper.setDisplay(id);
-//
-//        return Result.success();
-//    }
-//
-//
-//}

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

@@ -7,7 +7,6 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.po.*;
 import com.gis.domain.vo.*;
-import com.gis.mapper.CommonMapper;
 import com.gis.service.*;
 import com.gis.service.util.CommentTree;
 import com.gis.service.util.CommentTreeUtil;
@@ -41,31 +40,20 @@ public class WebController extends BaseController {
     private KnowledgeService knowledgeService;
 
     @Autowired
-    private SpiritService spiritService;
-
-    @Autowired
     private NewsService newsService;
 
     @Autowired
-    private MenuService menuService;
-
-    @Autowired
     private SceneService sceneService;
 
     @Autowired
     private VideoService videoService;
 
     @Autowired
-    private SlideshowService slideshowService;
-
-    @Autowired
     private CommentService commentService;
 
     @Autowired
     private SysUserService sysUserService;
 
-    @Autowired
-    private CommonMapper commonMapper;
 
     @Autowired
     private FodderService fodderService;
@@ -85,41 +73,6 @@ public class WebController extends BaseController {
     }
 
 
-//    @ApiOperation("导航栏")
-//    @GetMapping("navigation")
-//    public Result navigation() {
-//        List<MenuEntity> entities = menuService.findAll();
-//
-//        MenuTreeUtil menuTreeUtil = new MenuTreeUtil(entities);
-//        List<MenuTree> tree = menuTreeUtil.buildTree();
-//        return Result.success(tree);
-//    }
-
-//    @ApiOperation("精品典藏子菜单")
-//    @GetMapping("goodsNav")
-//    public Result goodsNav() {
-//
-//        Condition condition = new Condition(MenuEntity.class);
-//        // 写死了，菜单只能修改，不能删除
-//        condition.and().andEqualTo("parentId", "4");
-//        List<MenuEntity> entities = menuService.findAll(condition);
-//
-//        return Result.success(entities);
-//    }
-
-//    @ApiOperation("精品典藏详情(用于模型显示描述)")
-//    @GetMapping("goods/detail/{id}")
-//    public Result goodsDetail(@PathVariable Long id) {
-//        GoodsEntity entity = goodsService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        return Result.success(entity);
-//    }
-
-
     @ApiOperation("搜索")
     @PostMapping("search")
     public Result<NewsVo> search(@RequestBody PageDto param) {
@@ -144,50 +97,6 @@ public class WebController extends BaseController {
     }
 
 
-//    @ApiOperation("轮播图")
-//    @GetMapping("slideshow")
-//    public Result slideshow() {
-//
-//        Integer status = 4;
-//        Integer display = 1;
-//
-//        List<SlideshowVo> show = slideshowService.showDisplay(status, display);
-//        return Result.success(show);
-//    }
-
-
-//    @ApiOperation("史馆动态-新闻")
-//    @PostMapping("news")
-//    public Result news(@RequestBody NewsPageDateRequest param ) {
-//
-//        param.setType("news");
-//        startPage(param);
-//        PageInfo<NewsVo> page = new PageInfo<>(newsService.findDisplay(param));
-//
-//        return Result.success(page);
-//    }
-
-
-
-//    @ApiOperation("史馆动态-公告")
-//    @PostMapping("notice")
-//    public Result notice(@RequestBody NewsPageDateRequest param) {
-//
-//        param.setType("notice");
-//        startPage(param);
-//        PageInfo<NewsVo> page = new PageInfo<>(newsService.findDisplay(param));
-//
-//        return Result.success(page);
-//    }
-
-//    @ApiOperation("保存史馆动态浏览量")
-//    @GetMapping("news/view/{id}")
-//    public Result newsView(@PathVariable Long id) {
-//        newsService.setView(id);
-//        return Result.success();
-//    }
-
-
 
     @ApiOperation("文物库")
     @PostMapping("fodder")
@@ -197,22 +106,6 @@ public class WebController extends BaseController {
         PageInfo<FodderEntity> page = new PageInfo<>(fodderService.search(param));
         return Result.success(page);
     }
-//    @ApiOperation("保存特有精神浏览量")
-//    @GetMapping("spirit/view/{id}")
-//    public Result spiritView(@PathVariable Long id) {
-//        spiritService.setView(id);
-//        return Result.success();
-//    }
-
-//    @ApiOperation("保存精品典藏浏览量")
-//    @GetMapping("goods/view/{id}")
-//    public Result goodsView(@PathVariable Long id) {
-//        goodsService.setView(id);
-//        return Result.success();
-//    }
-
-
-
 
 
     @ApiOperation(value = "党史军史")
@@ -224,100 +117,6 @@ public class WebController extends BaseController {
         return Result.success(page);
     }
 
-//    @ApiOperation(value = "精品典藏-详情")
-//    @PostMapping("goods/detail/{id}")
-//    public Result<GoodsVo> goodsList(@PathVariable Long id) {
-//        GoodsEntity entity = goodsService.findById(id);
-//        if (entity == null) {
-//            log.error("对象id不存在 ： {}", id);
-//            return Result.failure("对象id不存在");
-//        }
-//
-//        String modelType = null;
-//        if (entity.getType() == 1) {
-//            modelType = TypeCode.MODEL_GOODS_IMG;
-//        } else if (entity.getType() == 2) {
-//            modelType = TypeCode.MODEL_GOODS_VIDEO;
-//        } else if (entity.getType() == 3) {
-//            modelType = TypeCode.MODEL_GOODS_MODEL;
-//        }
-//
-//        Condition condition = new Condition(FileEntity.class);
-//        condition.and().andEqualTo("fkId", id);
-//        condition.and().andEqualTo("type", modelType);
-//        List<FileEntity> fileList  = fileService.findAll(condition);
-//
-//        HashMap<Object, Object> result = new HashMap<>();
-//        result.put("entity", entity);
-//        result.put("file", fileList);
-//
-//        return Result.success(result);
-//    }
-
-
-//    @ApiOperation(value = "精品典藏-图片")
-//    @PostMapping("goods/img")
-//    public Result<FileEntity> goodsImg(@Valid @RequestBody GoodsPageDateDto param) {
-//
-////        startPage(param);
-//        param.setStatus(4);
-//
-//        String modelType = null;
-//        Integer type = param.getType();
-//        if (type == 1) {
-//            modelType = TypeCode.MODEL_GOODS_IMG;
-//        } else if (type == 2) {
-//            modelType = TypeCode.MODEL_GOODS_VIDEO;
-//        } else if (type == 3) {
-//            modelType = TypeCode.MODEL_GOODS_MODEL;
-//        }
-//
-//        List<FileEntity> fileList = fileService.findDisplayByType(1, modelType);
-//
-//
-//
-//
-//
-//        List<GoodsVo> search = goodsService.findDisplay(param);
-//        for (GoodsVo entity : search) {
-//            String modelType = null;
-//            Integer type = entity.getType();
-//            if (type == 1) {
-//                modelType = TypeCode.MODEL_GOODS_IMG;
-//            } else if (type == 2) {
-//                modelType = TypeCode.MODEL_GOODS_VIDEO;
-//            } else if (type == 3) {
-//                modelType = TypeCode.MODEL_GOODS_MODEL;
-//            }
-//
-//            Condition condition = new Condition(FileEntity.class);
-//            condition.and().andEqualTo("fkId", entity.getId());
-//            condition.and().andEqualTo("type", modelType);
-//
-//            List<FileEntity> fileList  = fileService.findAll(condition);
-//
-//            for (FileEntity file : fileList) {
-//                String title = entity.getTitle();
-//                file.setFileName(title+ "-" + file.getFileName());
-//                file.setYear(entity.getYear());
-//                resultList.add(file);
-//            }
-//        }
-//
-//
-//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-//        PageInfo<FileEntity> page = new PageInfo<>(resultList);
-//        return Result.success(page);
-//    }
-
-
-//    @ApiOperation(value = "精品典藏-获取年份")
-//    @GetMapping("goods/getYear/{type}")
-//    public Result getYear(@PathVariable Integer type) {
-//        Set<Integer> result = goodsService.getYear(type);
-//        return Result.success(result);
-//    }
-
 
     @ApiOperation(value = "数字史馆-场景")
     @GetMapping("scene")
@@ -415,13 +214,6 @@ public class WebController extends BaseController {
         return Result.success(password);
     }
 
-//    @ApiOperation("获取主题")
-//    @GetMapping("getTopic")
-//    public Result getTopic() {
-//        Map topic = commonMapper.getActivityTopic();
-//        return Result.success(topic);
-//    }
-
 
     @ApiOperation("检查token是否失效")
     @GetMapping("checkToken")
@@ -441,57 +233,5 @@ public class WebController extends BaseController {
     }
 
 
-//    @ApiOperation("测试删除")
-//    @GetMapping("testRemove")
-//    public Result testRemove() {
-//        for (int i = 0; i < 100; i++) {
-//            String path = FILE_PATH + "test/" + i +".png";
-//            log.info("path:  {}", path);
-//            FileUtil.del(path);
-//            log.info("i: {}", i);
-//
-//        }
-//
-//        return Result.success();
-//    }
-
-//    @ApiOperation("测试删除轮播图")
-//    @GetMapping("testRemoveLun/{ids}")
-//    public Result testRemoveLun(@PathVariable String ids) {
-//
-//
-//        List<SlideshowEntity> list = slideshowService.findByIds(ids);
-//
-//        int n = 1;
-//        for (SlideshowEntity entity: list) {
-//            String img = entity.getImg();
-//            log.info("imgPath: {}", img);
-//            String imgPath = subStringAfter(img);
-//            log.info("imgSubPath: {}", imgPath);
-//            FileUtil.del(imgPath);
-//
-//            String thumb = entity.getThumb();
-//            log.info("thumbPath: {}", thumb);
-//            String thumbPath = subStringAfter(thumb);
-//            log.info("thumbSubPath: {}", thumbPath);
-//            FileUtil.del(thumbPath);
-//
-//            log.info("n: {}", n+1);
-//            slideshowService.delete(entity);
-//        }
-//
-//
-//
-//        return Result.success();
-//    }
-
-
-
-
-
-
-
-
-
 
 }

pom.xml

@@ -48,8 +48,6 @@
         <tk.mybatis.version>2.0.2</tk.mybatis.version>
         <tk.mapper.version>4.0.3</tk.mapper.version>
         <pagehelper.version>1.2.5</pagehelper.version>
-        <!--<dingtalk.version>1479188381469-20200609</dingtalk.version>-->
-        <!--<poi.version>3.17</poi.version>-->
 
     </properties>
 
@@ -123,12 +121,6 @@
                 <version>${spring.boot.version}</version>
             </dependency>
 
-            <!--rabbit MQ-->
-            <!--<dependency>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-starter-amqp</artifactId>-->
-                <!--<version>${spring.boot.version}</version>-->
-            <!--</dependency>-->
 
             <!-- lombok -->
             <dependency>
@@ -201,24 +193,24 @@
             </dependency>
 
             <!--aliyun sdk-->
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-core</artifactId>
-                <version>${aliyun.core.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>com.aliyun</groupId>-->
+                <!--<artifactId>aliyun-java-sdk-core</artifactId>-->
+                <!--<version>${aliyun.core.version}</version>-->
+            <!--</dependency>-->
 
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-                <version>${aliyun.dysmsapi.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>com.aliyun</groupId>-->
+                <!--<artifactId>aliyun-java-sdk-dysmsapi</artifactId>-->
+                <!--<version>${aliyun.dysmsapi.version}</version>-->
+            <!--</dependency>-->
 
-            <!--aliyun oss-->
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>${aliyun.oss.version}</version>
-            </dependency>
+            <!--&lt;!&ndash;aliyun oss&ndash;&gt;-->
+            <!--<dependency>-->
+                <!--<groupId>com.aliyun.oss</groupId>-->
+                <!--<artifactId>aliyun-sdk-oss</artifactId>-->
+                <!--<version>${aliyun.oss.version}</version>-->
+            <!--</dependency>-->
 
 
             <!--tk.mybatis 依赖-->