Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms

# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml

pom.xml

@@ -16,7 +16,7 @@
         <ruoyi.version>3.8.2</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.8</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
@@ -25,8 +25,7 @@
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
         <fastjson.version>1.2.80</fastjson.version>
-        <oshi.version>6.1.2</oshi.version>
-        <jna.version>5.10.0</jna.version>
+        <oshi.version>6.1.6</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.collections.version>3.2.2</commons.collections.version>
@@ -83,18 +82,6 @@
                 <version>${oshi.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna</artifactId>
-                <version>${jna.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna-platform</artifactId>
-                <version>${jna.version}</version>
-            </dependency>
-
             <!-- Swagger3依赖 -->
             <dependency>
                 <groupId>io.springfox</groupId>

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

@@ -16,11 +16,11 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("(♥◠‿◠)ﾉﾞ  我们一起学喵叫   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
+                " |  _ _   \\   喵   \\   \\   /  /    \n" +
+                " | ( ' )  |   喵    \\  _. /  '       \n" +
+                " |(_ o _) /     喵   _( )_ .'         \n" +
                 " | (_,_).' __  ___(_ o _)'          \n" +
                 " |  |\\ \\  |  ||   |(_,_)'         \n" +
                 " |  | \\ `'   /|   `-'  /           \n" +

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AdahTestingController.java

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+/**
+ *  亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:08
+ */
+public class AdahTestingController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AtmosphereController.java

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 10:56
+ */
+public class AtmosphereController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ENSOController.java

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+/**
+ * ENSO影响监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:12
+ */
+public class ENSOController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ForestController.java

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:13
+ */
+public class ForestController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/GlobalEcologyController.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *全球生态环境监测
+     * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:05
+ */
+@RestController
+@RequestMapping("/monitor/clobal")
+public class GlobalEcologyController {
+
+}

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

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:10
+ */
+public class SpecialReportController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/UrbanController.java

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 10:55
+ */
+public class UrbanController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -8,8 +8,11 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.config.RuoYiConfig;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.google.code.kaptcha.Producer;
 import com.ruoyi.common.constant.Constants;
@@ -33,10 +36,10 @@ public class CaptchaController
     @Resource(name = "captchaProducerMath")
     private Producer captchaProducerMath;
 
-    @Autowired
+    @Resource
     private RedisCache redisCache;
     
-    @Autowired
+    @Resource
     private ISysConfigService configService;
     /**
      * 生成验证码

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

@@ -71,7 +71,7 @@ spring:
     # 数据库索引
     database: 3
     # 密码
-    password: sdust2020
+    password: yhy_app
     # 连接超时时间
     timeout: 10s
     lettuce:

ruoyi-admin/src/main/resources/banner.txt

@@ -2,7 +2,7 @@ Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //
-//                         o8888888o                              //
+//                         o6666666o                              //
 //                         88" . "88                              //
 //                         (| ^_^ |)                              //
 //                         O\  =  /O                              //

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -15,7 +15,8 @@ public class PageUtils extends PageHelper
     /**
      * 设置请求分页数据
      */
-    public static void startPage()
+    public static void
+    startPage()
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -672,6 +672,46 @@ public class ExcelUtil<T>
         style.setFont(totalFont);
         styles.put("total", style);
 
+        styles.putAll(annotationStyles(wb));
+
+        return styles;
+    }
+
+    /**
+     * 根据Excel注解创建表格样式
+     * 
+     * @param wb 工作薄对象
+     * @return 自定义样式列表
+     */
+    private Map<String, CellStyle> annotationStyles(Workbook wb)
+    {
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields)
+        {
+            Excel excel = (Excel) os[1];
+            String key = "data_" + excel.align() + "_" + excel.color();
+            if (!styles.containsKey(key))
+            {
+                CellStyle style = wb.createCellStyle();
+                style = wb.createCellStyle();
+                style.setAlignment(excel.align());
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                style.setBorderRight(BorderStyle.THIN);
+                style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderLeft(BorderStyle.THIN);
+                style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderTop(BorderStyle.THIN);
+                style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderBottom(BorderStyle.THIN);
+                style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                Font dataFont = wb.createFont();
+                dataFont.setFontName("Arial");
+                dataFont.setFontHeightInPoints((short) 10);
+                dataFont.setColor(excel.color().index);
+                style.setFont(dataFont);
+                styles.put(key, style);
+            }
+        }
         return styles;
     }
 
@@ -793,7 +833,7 @@ public class ExcelUtil<T>
             {
                 // 创建cell
                 cell = row.createCell(column);
-                setDataCell(cell, attr);
+                cell.setCellStyle(styles.get("data_" + attr.align() + "_" + attr.color()));
 
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
@@ -836,34 +876,6 @@ public class ExcelUtil<T>
         return cell;
     }
 
-    /**
-     * 设置单元格样式
-     * 
-     * @param cell 单元格
-     * @param excel 注解信息
-     */
-    public void setDataCell(Cell cell, Excel excel)
-    {
-        CellStyle style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setBorderTop(BorderStyle.THIN);
-        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setAlignment(excel.align());
-        Font dataFont = wb.createFont();
-        dataFont.setFontName("Arial");
-        dataFont.setFontHeightInPoints((short) 10);
-        dataFont.setColor(excel.color().index);
-        style.setFont(dataFont);
-        cell.setCellStyle(style);
-    }
-
     /**
      * 设置 POI XSSFSheet 单元格提示或选择框
      * 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AdahTestingMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AtmosphereMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface ENSOMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface ForestMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface GlobalEcologyMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface UrbanMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAdahTestingService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IAtmosphereService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * ENSO影响监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:35
+ */
+public interface IENSOService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:38
+ */
+public interface IForestService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 全球生态环境监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:37
+ */
+public interface IGlobalEcologyService {
+}

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

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:39
+ */
+public interface ISpecialReportService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -2,12 +2,15 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.SysConfig;
+import org.springframework.stereotype.Service;
 
 /**
  * 参数配置 服务层
  * 
  * @author ruoyi
  */
+
+
 public interface ISysConfigService
 {
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:40
+ */
+public interface IUrbanService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IAdahTestingService;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+public class AdahTestingServiceimpl implements IAdahTestingService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IAtmosphereService;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+public class AtmosphereServiceimpl  implements IAtmosphereService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IENSOService;
+
+/**
+ * ENSO影响监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:46
+ */
+public class ENSOServiceimpl implements IENSOService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IForestService;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+public class ForestServiceimpl implements IForestService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IGlobalEcologyService;
+
+/**
+ * 全球生态环境监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+public class GlobalEcologyServiceimpl implements IGlobalEcologyService {
+}

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

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.ISpecialReportService;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:48
+ */
+public class SpecialReportServiceimpl  implements ISpecialReportService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
@@ -25,10 +26,10 @@ import java.util.List;
 @Service
 public class SysConfigServiceImpl implements ISysConfigService
 {
-    @Autowired
+    @Resource
     private SysConfigMapper configMapper;
 
-    @Autowired
+    @Resource
     private RedisCache redisCache;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IUrbanService;
+
+/**
+ * * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:49
+ */
+public class UrbanServiceimpl implements IUrbanService {
+}

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

@@ -0,0 +1,8 @@
+<?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.AdahTestingMapper">
+
+
+</mapper> 

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

@@ -0,0 +1,8 @@
+<?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.AtmosphereMapper">
+
+
+</mapper> 

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

@@ -0,0 +1,8 @@
+<?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.ENSOMapper">
+
+
+</mapper> 

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

@@ -0,0 +1,8 @@
+<?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.ForestMapper">
+
+
+</mapper> 

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

@@ -0,0 +1,7 @@
+<?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.GlobalEcologyMapper">
+
+</mapper> 

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

@@ -0,0 +1,8 @@
+<?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.UrbanMapper">
+
+
+</mapper> 

ruoyi-ui/src/views/monitor/server/index.vue

@@ -106,7 +106,7 @@
             <span>Java虚拟机信息</span>
           </div>
           <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;">
+            <table cellspacing="0" style="width: 100%;table-layout:fixed;">
               <tbody>
                 <tr>
                   <td class="el-table__cell is-leaf"><div class="cell">Java名称</div></td>

ruoyi-ui/src/views/system/dict/data.vue

@@ -191,7 +191,7 @@
 
 <script>
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listType, getType } from "@/api/system/dict/type";
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
 
 export default {
   name: "Data",
@@ -287,8 +287,8 @@ export default {
     },
     /** 查询字典类型列表 */
     getTypeList() {
-      listType().then(response => {
-        this.typeOptions = response.rows;
+      getDictOptionselect().then(response => {
+        this.typeOptions = response.data;
       });
     },
     /** 查询字典数据列表 */