更新

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,11 +1,15 @@
 package com.ruoyi;
 
+import com.sun.jna.platform.unix.solaris.LibKstat;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.util.ObjectUtils;
 
+import javax.print.attribute.standard.MediaSize;
+import java.time.Year;
 
 
 /**
@@ -19,6 +23,7 @@ public class RuoYiApplication
 {
     public static void main(String[] args)
     {
+
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java

@@ -61,6 +61,11 @@ public class CityExpandControllerr
      */
     @RequestMapping(value = "/selectInformation",method = {RequestMethod.GET})
     public  AjaxResult selectInformation(String city,String country,String year){
+//        if (city.equals("")&&country.equals(""))
+//        {
+//            List<CityInformation> value= service.selectMain(year);
+//            return AjaxResult.success(value);
+//        }
         List<CityInformation> value= service.selectInfrom(city,country,year);
         return AjaxResult.success(value);
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java

@@ -1,13 +1,20 @@
 package com.ruoyi.web.controller.yada;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import com.ruoyi.system.service_yada.ISpecialReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 专题报告
  */
@@ -17,6 +24,61 @@ import org.springframework.web.bind.annotation.RestController;
 public class SpecialReportController
 {
 
+    @Resource
+    private ISpecialReportService service;
+
+    @RequestMapping(value = "/getSpecial",method = {RequestMethod.GET})
+    @ApiOperation(value = "返回专题数据",httpMethod = "GET")
+    public AjaxResult getSpecial(String zone)
+    {
+        List<SpecialVO> value=service.selectSpecial(zone);
+
+        return  AjaxResult.success(value);
+    }
+
+    @RequestMapping(value = "/DelSpecial",method = {RequestMethod.GET})
+    @ApiOperation(value = "删除专题数据",httpMethod = "GET")
+    public AjaxResult DelSpecial(@RequestParam("id") Integer id)
+    {
+        Integer value=service.DelSpecial(id);
+        if (value>0){
+            return  AjaxResult.success("成功！");
+        }else {
+            return  AjaxResult.error();
+        }
+    }
+
+
+    @RequestMapping(value = "/updateUploadSpecial",method = {RequestMethod.GET})
+    @ApiOperation(value = "修改下载数量",httpMethod = "GET")
+    public AjaxResult updateUploadSpecial(@RequestParam("id") Integer id)
+    {
+        Integer value=service.updateUploadSpecial(id);
+
+        if (value>0){return  AjaxResult.success("成功！");}
+        return  AjaxResult.error();
+
+    }
+
+    @RequestMapping(value = "/getUploadSpecial")
+    @ApiOperation(value = "返回专题通报")
+    public  AjaxResult getUploadSpecial(String fileName)
+    {
+        List<UploadSpecialVO> value=service.selectUploadSpecial(fileName);
+
+        return  AjaxResult.success(value);
+    }
+
+    @RequestMapping(value = "/getUploadStandard")
+    @ApiOperation(value = "返回专题规范")
+    public  AjaxResult getUploadStandard(String fileName)
+    {
+        List<UploadSpecialVO> value=service.selectUploadSpecial1(fileName);
+
+        return  AjaxResult.success(value);
+    }
+
+
     @RequestMapping(value = "/getWord",method = {RequestMethod.GET})
     @ApiOperation(value = "返回专题报告路径",httpMethod = "GET")
     public AjaxResult getWord(@RequestParam("path") String path,@RequestParam("name") String name)
@@ -25,10 +87,10 @@ public class SpecialReportController
         switch (path)
         {
             case "ch":
-                route="avatar/word/全球生态环境遥感监测2021年度报告-中文版-20220309.docx";
+                route="avatar/word/陆域中文1130.pdf";
                 break;
             case "en":
-                route="avatar/word/全球生态环境遥感监测2021年度报告-英文简本-20211102.docx";
+                route="avatar/word/陆域中文1130.pdf";
                 break;
             default:
                 return  AjaxResult.error("未找到对应路径");

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,6 +6,7 @@ spring:
         driver-class-name: org.postgresql.Driver
         druid:
             master:
+                #url: jdbc:postgresql://121.36.229.60:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
                 url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
                 username: sjs
                 password: song5325

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: D:/ruoyi/uploadPath   #/home/sjs/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -134,3 +134,4 @@ xss:
   excludes: /system/notice/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/home/sjs/ruoyi/logs/yada" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -113,17 +113,17 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/webjars/**").anonymous()
                 .antMatchers("/login", "/captcha/get", "/captcha/check").permitAll()
                 .antMatchers("/*/api-docs").anonymous()
-                .antMatchers("/druid/**").anonymous();
+                .antMatchers("/druid/**").anonymous()
 //                // 除上面外的所有请求全部需要鉴权认证
-//                .anyRequest().authenticated()
-//                .and()
-//                .headers().frameOptions().disable();
-//        httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
-//        // 添加JWT filter
-//        httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
-//        // 添加CORS filter
-//        httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
-//        httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
+                .anyRequest().authenticated()
+                .and()
+                .headers().frameOptions().disable();
+        httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
+        // 添加JWT filter
+        httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
+        // 添加CORS filter
+        httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
+        httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java

@@ -0,0 +1,78 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/20 11:48
+ */
+public class SpecialVO extends SysBaseEntity
+{
+    private  String id;
+
+    private  String fileName;
+
+    private  String dateTime;
+
+    private  String spaceDistinguish;
+
+    private  String timeDistinguish;
+
+    private  String zone;
+
+    private  String filePath;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(String dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getSpaceDistinguish() {
+        return spaceDistinguish;
+    }
+
+    public void setSpaceDistinguish(String spaceDistinguish) {
+        this.spaceDistinguish = spaceDistinguish;
+    }
+
+    public String getTimeDistinguish() {
+        return timeDistinguish;
+    }
+
+    public void setTimeDistinguish(String timeDistinguish) {
+        this.timeDistinguish = timeDistinguish;
+    }
+
+    public String getZone() {
+        return zone;
+    }
+
+    public void setZone(String zone) {
+        this.zone = zone;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java

@@ -33,6 +33,8 @@ public class ThematicMapDomain extends SysBaseEntity {
 
     private String createdBy;
 
+    private  String year;
+
     private LocalDateTime createdTime;
 
     public String getPictureCode() {
@@ -155,4 +157,12 @@ public class ThematicMapDomain extends SysBaseEntity {
                 ", createdTime=" + createdTime +
                 '}';
     }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java

@@ -0,0 +1,92 @@
+package com.ruoyi.system.domain_yada;
+
+import javax.xml.stream.events.DTD;
+import java.awt.*;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/20 16:47
+ */
+public class UploadSpecialVO extends SysBaseEntity
+{
+
+    private  String id;
+
+    private  String fileName;
+
+    private String uploadNum;
+
+    private String filePath;
+
+    private String type;
+
+    private  String remarks1;
+
+    private  String remarks2;
+
+    private  String sign;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getUploadNum() {
+        return uploadNum;
+    }
+
+    public void setUploadNum(String uploadNum) {
+        this.uploadNum = uploadNum;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getRemarks1() {
+        return remarks1;
+    }
+
+    public void setRemarks1(String remarks1) {
+        this.remarks1 = remarks1;
+    }
+
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java

@@ -24,4 +24,5 @@ public interface CityExpandMapper {
     List<CityInformation> selectInfrom(@Param("city") String city,
                                        @Param("country") String country,
                                        @Param("year") String year);
+    List<CityInformation> selectMain( @Param("year") String year);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java

@@ -0,0 +1,28 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/20 11:54
+ */
+public interface SpecialReportMapper {
+
+  List<SpecialVO> selectSpecial(@Param("zone") String zone);
+
+  List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName);
+
+  List<UploadSpecialVO> selectUploadSpecial1(@Param("fileName") String fileName);
+
+  Integer updateUploadSpecial(@Param("id") Integer id);
+
+  Integer IntoUploadSpecial(UploadSpecialVO specialVO);
+
+  Integer DelSpecial(@Param("id") Integer id);
+
+  Integer IntoSpecial(SpecialVO specialVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java

@@ -18,4 +18,6 @@ public interface ICityExpandService {
     List<OrientationVO> selectOrientation(String city, String superior,String country);
 
     List<CityInformation> selectInfrom(String city, String country,String year);
+
+    List<CityInformation> selectMain(String year);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java

@@ -1,9 +1,29 @@
 package com.ruoyi.system.service_yada;
 
+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 专题报告
  * @Author: JinSheng Song
  * @Date: 2022/5/11 11:39
  */
 public interface ISpecialReportService {
+
+    List<SpecialVO> selectSpecial(String zone);
+
+    List<UploadSpecialVO> selectUploadSpecial(String fileName);
+
+    List<UploadSpecialVO> selectUploadSpecial1(String fileName);
+
+    Integer updateUploadSpecial( Integer id);
+
+    Integer IntoUploadSpecial(UploadSpecialVO specialVO);
+
+    Integer DelSpecial( Integer id);
+
+    Integer IntoSpecial(SpecialVO specialVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java

@@ -38,4 +38,9 @@ public class CityExpandServiceimpl implements ICityExpandService {
     public List<CityInformation> selectInfrom(String city, String country,String year) {
         return mapper.selectInfrom(city,country,year);
     }
+
+    @Override
+    public List<CityInformation> selectMain(String year) {
+        return mapper.selectMain(year);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java

@@ -1,12 +1,57 @@
 package com.ruoyi.system.service_yada.impl;
 
+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import com.ruoyi.system.mapper_yada.SpecialReportMapper;
 import com.ruoyi.system.service_yada.ISpecialReportService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 专题报告
  * @Author: JinSheng Song
  * @Date: 2022/5/11 11:48
  */
+@Service
 public class SpecialReportServiceimpl  implements ISpecialReportService {
 
+    @Resource
+    private SpecialReportMapper mapper;
+
+    @Override
+    public List<SpecialVO> selectSpecial(String zone) {
+        return mapper.selectSpecial(zone);
+    }
+
+    @Override
+    public List<UploadSpecialVO> selectUploadSpecial(String fileName) {
+        return mapper.selectUploadSpecial(fileName);
+    }
+
+    @Override
+    public List<UploadSpecialVO> selectUploadSpecial1(String fileName) {
+        return  mapper.selectUploadSpecial1(fileName);
+    }
+
+    @Override
+    public Integer updateUploadSpecial(Integer id) {
+        return mapper.updateUploadSpecial(id);
+    }
+
+    @Override
+    public Integer IntoUploadSpecial(UploadSpecialVO specialVO) {
+        return mapper.IntoUploadSpecial(specialVO);
+    }
+
+    @Override
+    public Integer DelSpecial(Integer id) {
+        return mapper.DelSpecial(id);
+    }
+
+    @Override
+    public Integer IntoSpecial(SpecialVO specialVO) {
+        return mapper.IntoSpecial(specialVO);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml

@@ -103,5 +103,13 @@
         </if>
 
     </select>
+    <select id="selectMain" resultMap="RM_Inform">
+        SELECT  <include refid="columns_Infrom"/>  FROM  urban_impervious_surface
+        where country='澜湄流域'
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
+
+    </select>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.SpecialReportMapper">
+
+    <resultMap id="RM_Special" type="com.ruoyi.system.domain_yada.SpecialVO">
+        <result property="id" column="id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="dateTime" column="date_time"/>
+        <result property="spaceDistinguish" column="space_distinguish"/>
+        <result property="timeDistinguish" column="time_distinguish"/>
+        <result property="zone" column="zone"/>
+        <result property="filePath" column="file_path"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <resultMap id="RM_Upload" type="com.ruoyi.system.domain_yada.UploadSpecialVO">
+        <result property="id" column="id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="uploadNum" column="upload_num"/>
+        <result property="filePath" column="file_path"/>
+        <result property="remarks1" column="remarks1"/>
+        <result property="sign" column="sign"/>
+        <result property="remarks2" column="remarks2"/>
+        <result property="type" column="type"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,file_name,file_path,date_time,space_distinguish,time_distinguish,zone,created_by,created_time
+        ]]>
+	</sql>
+
+    <sql id="Upload">
+	    <![CDATA[
+        id,file_name,upload_num,file_path,remarks1,remarks2,type,created_by,created_time,sign
+        ]]>
+	</sql>
+
+    <select id="selectSpecial" resultMap="RM_Special">
+        SELECT  <include refid="columns"/>  FROM  special_table
+            WHERE 1=1
+            <if test="zone!= null and zone !=''">
+            AND zone = #{zone}
+            </if>
+    </select>
+
+    <select id="selectUploadSpecial" resultMap="RM_Upload">
+        SELECT  <include refid="Upload"/>  FROM  upload_special
+        WHERE type='1'
+        <if test="fileName!= null and fileName !=''">
+            AND file_name = #{fileName}
+        </if>
+    </select>
+
+    <select id="selectUploadSpecial1" resultMap="RM_Upload">
+        SELECT  <include refid="Upload"/>  FROM  upload_special
+        WHERE type='2'
+        <if test="fileName!= null and fileName !=''">
+            AND file_name = #{fileName}
+        </if>
+    </select>
+
+    <delete id="DelSpecial">
+        DELETE FROM special_table
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoSpecial">
+        <![CDATA[
+        INSERT INTO special_table (
+            file_name ,
+            date_time ,
+            space_distinguish ,
+            time_distinguish ,
+            zone ,
+            created_by,
+            created_time
+        ) VALUES (
+                     #{fileName,jdbcType=VARCHAR},
+                     #{dateTime,jdbcType=VARCHAR},
+                     #{spaceDistinguish,jdbcType=VARCHAR},
+                     #{timeDistinguish,jdbcType=DOUBLE},
+                     #{zone,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                    #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+
+
+
+
+
+    <update id="updateUploadSpecial">
+        update  upload_special set upload_num=upload_num+1
+            where id=#{id}
+    </update>
+
+    <insert id="IntoUploadSpecial">
+    <![CDATA[
+        INSERT INTO upload_special (
+            file_name ,
+            upload_num ,
+            file_path ,
+            remarks1 ,
+            remarks2 ,
+            type,
+            created_by,
+            created_time
+        ) VALUES (
+                     #{fileName,jdbcType=VARCHAR},
+                     #{uploadNum,jdbcType=INTEGER},
+                     #{filePath,jdbcType=VARCHAR},
+                     #{remarks1,jdbcType=VARCHAR},
+                     #{remarks2,jdbcType=VARCHAR},
+                     #{type,jdbcType=VARCHAR},
+                     #{createBy,jdbcType=VARCHAR},
+                    #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pictureTime" column="picture_time"/>
         <result property="picturePath" column="picture_path"/>
         <result property="remarks" column="remarks"/>
+        <result property="year" column="year"/>
         <result property="createdBy" column="created_by"/>
         <result property="createdTime" column="created_time"/>
     </resultMap>
@@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="columns">
 	    <![CDATA[
-        id,picture_zh,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
+        id,picture_zh,year,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
         ]]>
 	</sql>
     <sql id="cloumns_Map">