功能迭代

Merge pull request !471 from XCSDN/N/A

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.1</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.2</h1>
 <h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.1-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.2-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 

pom.xml

@@ -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>
+        <oshi.version>6.1.6</oshi.version>
-        <jna.version>5.10.0</jna.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>
@@ -43,7 +42,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.5.11</version>
+                <version>2.5.13</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -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/web/controller/RemoteSensing/AustraliaMiddleEastController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.controller.RemoteSensing;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service.IAustraliaMiddleEastService;
+import com.ruoyi.system.service.IForestService;
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *  澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:08
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8")
+public class AustraliaMiddleEastController
+{
+   // @Autowired
+    private IAustraliaMiddleEastService australiaMiddleEastService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+             return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
+    public AjaxResult DelAustralia(@Param("ID") String ID)
+    {
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    {
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -5,6 +5,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
 
 /**
@@ -56,11 +58,6 @@ public @interface Excel
      */
     public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
-    /**
-     * 导出类型（0数字 1字符串）
-     */
-    public ColumnType cellType() default ColumnType.STRING;
-
     /**
      * 导出时在excel中每个列的高度 单位为字符
      */
@@ -107,9 +104,19 @@ public @interface Excel
     public boolean isStatistics() default false;
 
     /**
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+     * 导出类型（0数字 1字符串）
      */
-    public Align align() default Align.AUTO;
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出字体颜色
+     */
+    public IndexedColors color() default IndexedColors.BLACK;
+
+    /**
+     * 导出字段对齐方式
+     */
+    public HorizontalAlignment align() default HorizontalAlignment.CENTER;
 
     /**
      * 自定义数据处理器

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,7 +32,7 @@ public class SysDept extends BaseEntity
     private String deptName;
 
     /** 显示顺序 */
-    private String orderNum;
+    private Integer orderNum;
 
     /** 负责人 */
     private String leader;
@@ -96,13 +97,13 @@ public class SysDept extends BaseEntity
         this.deptName = deptName;
     }
 
-    @NotBlank(message = "显示顺序不能为空")
+    @NotNull(message = "显示顺序不能为空")
-    public String getOrderNum()
+    public Integer getOrderNum()
     {
         return orderNum;
     }
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(Integer orderNum)
     {
         this.orderNum = orderNum;
     }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -57,6 +58,7 @@ public class SysDictType extends BaseEntity
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
     public String getDictType()
     {
         return dictType;

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.page;
 
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.ServletUtils;
 
 /**
@@ -40,8 +41,8 @@ public class TableSupport
     public static PageDomain getPageDomain()
     {
         PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
+        pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
-        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
+        pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
         pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
         pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
         pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));

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

@@ -20,13 +20,10 @@ public class PageUtils extends PageHelper
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
-        {
         String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
         Boolean reasonable = pageDomain.getReasonable();
         PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
     }
-    }
 
     /**
      * 清理分页的线程变量

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -17,6 +17,7 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import org.apache.commons.io.FilenameUtils;
 
 /**
  * 文件处理工具类
@@ -256,7 +257,7 @@ public class FileUtils
     }
 
     /**
-     * 获取名称
+     * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
      * 
      * @param fileName 路径名称
      * @return 没有文件路径的名称
@@ -272,4 +273,21 @@ public class FileUtils
         int index = Math.max(lastUnixPos, lastWindowsPos);
         return fileName.substring(index + 1);
     }
+
+    /**
+     * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+     * 
+     * @param fileName 路径名称
+     * @return 没有文件路径和后缀的名称
+     */
+    public static String getNameNotSuffix(String fileName)
+    {
+        if (fileName == null)
+        {
+            return null;
+        }
+        String baseName = FilenameUtils.getBaseName(fileName);
+        return baseName;
+    }
+
 }

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

@@ -672,21 +672,46 @@ public class ExcelUtil<T>
         style.setFont(totalFont);
         styles.put("total", style);
 
-        style = wb.createCellStyle();
+        styles.putAll(annotationStyles(wb));
-        style.cloneStyleFrom(styles.get("data"));
-        style.setAlignment(HorizontalAlignment.LEFT);
-        styles.put("data1", style);
 
-        style = wb.createCellStyle();
+        return styles;
-        style.cloneStyleFrom(styles.get("data"));
+    }
-        style.setAlignment(HorizontalAlignment.CENTER);
-        styles.put("data2", style);
 
+    /**
+     * 根据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.cloneStyleFrom(styles.get("data"));
+                style.setAlignment(excel.align());
-        style.setAlignment(HorizontalAlignment.RIGHT);
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
-        styles.put("data3", style);
+                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;
     }
 
@@ -786,17 +811,10 @@ public class ExcelUtil<T>
             // 设置列宽
             sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
         }
-        // 如果设置了提示信息则鼠标放上去提示.
+        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
-        if (StringUtils.isNotEmpty(attr.prompt()))
         {
-            // 这里默认设了2-101列提示.
+            // 提示信息或只能选择不能输入的列内容.
-            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+            setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
-        }
-        // 如果设置了combo属性则本列只能选择不能输入
-        if (attr.combo().length > 0)
-        {
-            // 这里默认设了2-101列只能选择不能输入.
-            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
         }
     }
 
@@ -815,8 +833,7 @@ public class ExcelUtil<T>
             {
                 // 创建cell
                 cell = row.createCell(column);
-                int align = attr.align().value();
+                cell.setCellStyle(styles.get("data_" + attr.align() + "_" + attr.color()));
-                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
 
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
@@ -860,48 +877,29 @@ public class ExcelUtil<T>
     }
 
     /**
-     * 设置 POI XSSFSheet 单元格提示
+     * 设置 POI XSSFSheet 单元格提示或选择框
      * 
      * @param sheet 表单
-     * @param promptTitle 提示标题
+     * @param textlist 下拉框显示的内容
      * @param promptContent 提示内容
      * @param firstRow 开始行
      * @param endRow 结束行
      * @param firstCol 开始列
      * @param endCol 结束列
      */
-    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+    public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
             int firstCol, int endCol)
     {
         DataValidationHelper helper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
+        DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         DataValidation dataValidation = helper.createValidation(constraint, regions);
-        dataValidation.createPromptBox(promptTitle, promptContent);
+        if (StringUtils.isNotEmpty(promptContent))
-        dataValidation.setShowPromptBox(true);
-        sheet.addValidationData(dataValidation);
-    }
-
-    /**
-     * 设置某些列的值只能输入预制的数据,显示下拉框.
-     * 
-     * @param sheet 要设置的sheet.
-     * @param textlist 下拉框显示的内容
-     * @param firstRow 开始行
-     * @param endRow 结束行
-     * @param firstCol 开始列
-     * @param endCol 结束列
-     * @return 设置好的sheet.
-     */
-    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
         {
-        DataValidationHelper helper = sheet.getDataValidationHelper();
+            // 如果设置了提示信息则鼠标放上去提示
-        // 加载下拉列表内容
+            dataValidation.createPromptBox("", promptContent);
-        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
+            dataValidation.setShowPromptBox(true);
-        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        }
-        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
-        // 数据有效性对象
-        DataValidation dataValidation = helper.createValidation(constraint, regions);
         // 处理Excel兼容性问题
         if (dataValidation instanceof XSSFDataValidation)
         {
@@ -912,7 +910,6 @@ public class ExcelUtil<T>
         {
             dataValidation.setSuppressDropDownArrow(false);
         }
-
         sheet.addValidationData(dataValidation);
     }
 

ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -78,14 +78,24 @@
           v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
+      v-if="refreshTable"
       v-loading="loading"
       :data="${businessName}List"
       row-key="${treeCode}"
-      default-expand-all
+      :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 #foreach($column in $columns)
@@ -293,6 +303,10 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -423,6 +437,14 @@ export default {
       this.open = true;
       this.title = "添加${functionName}";
     },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -76,14 +76,23 @@
           v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
+      v-if="refreshTable"
       v-loading="loading"
       :data="${businessName}List"
       row-key="${treeCode}"
-      default-expand-all
+      :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 #foreach($column in $columns)
@@ -165,11 +174,13 @@
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
         <el-form-item label="${comment}" prop="${treeParentCode}">
-          <tree-select
+          <el-tree-select
-            v-model:value="form.${treeParentCode}"
+            v-model="form.${treeParentCode}"
-            :options="${businessName}Options"
+            :data="${businessName}Options"
-            :objMap="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
             placeholder="请选择${comment}"
+            check-strictly
           />
         </el-form-item>
 #elseif($column.htmlType == "input")
@@ -283,6 +294,8 @@ const open = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const title = ref("");
+const isExpandAll = ref(true);
+const refreshTable = ref(true);
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -343,8 +356,8 @@ function getList() {
 }
 
 /** 查询${functionName}下拉树结构 */
-async function getTreeselect() {
+function getTreeselect() {
-  await list${BusinessName}().then(response => {
+  list${BusinessName}().then(response => {
     ${businessName}Options.value = [];
     const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
     data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
@@ -393,9 +406,9 @@ function resetQuery() {
 }
 
 /** 新增按钮操作 */
-async function handleAdd(row) {
+function handleAdd(row) {
   reset();
-  await getTreeselect();
+  getTreeselect();
   if (row != null && row.${treeCode}) {
     form.value.${treeParentCode} = row.${treeCode};
   } else {
@@ -405,6 +418,15 @@ async function handleAdd(row) {
   title.value = "添加${functionName}";
 }
 
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  nextTick(() => {
+    refreshTable.value = true;
+  });
+}
+
 /** 修改按钮操作 */
 async function handleUpdate(row) {
   reset();

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java

@@ -15,6 +15,7 @@ import com.ruoyi.common.constant.ScheduleConstants;
 import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.common.exception.job.TaskException.Code;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.quartz.domain.SysJob;
 
 /**
@@ -127,6 +128,7 @@ public class ScheduleUtils
         {
             return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
         }
-        return true;
+        Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
+        return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR);
     }
 }

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

@@ -0,0 +1,21 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+
+import java.util.List;
+
+/**
+ * 澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AustraliaMiddleEastMapper {
+
+    List<AustraliaMiddleEastVO> selectAustralia();
+
+    Integer DelAustralia(@Param("id") String id);
+
+    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.vo.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface RegionVGIMapper {
+
+    List<RegionVGIVO> selectRegion();
+
+    Integer DelRegion(@Param("id") String id);
+
+    Integer IntoRegion(RegionVGIVO regionVGIVO);
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAustraliaMiddleEastService
+{
+    public  List<AustraliaMiddleEastVO> selectAustralia();
+
+    public Integer DelAustralia(@Param("id") String id);
+
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.vo.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IRegionVGIService {
+
+    public List<RegionVGIVO> selectRegion();
+
+    public Integer DelRegion(@Param("id") String id);
+
+    public Integer IntoRegion(RegionVGIVO eastVO);
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.mapper.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper.SysLogininforMapper;
+import com.ruoyi.system.service.IAustraliaMiddleEastService;
+import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService
+{
+    @Autowired
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+
+    @Override
+    public List<AustraliaMiddleEastVO> selectAustralia()
+    {
+        return australiaMiddleEastMapper.selectAustralia();
+    }
+
+    @Override
+    public Integer DelAustralia(String id) {
+        return australiaMiddleEastMapper.DelAustralia(id);
+
+    }
+
+    @Override
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.mapper.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper.RegionVGIMapper;
+import com.ruoyi.system.service.IRegionVGIService;
+import com.ruoyi.system.vo.RegionVGIVO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+public class RegionVGIServiceimpl implements IRegionVGIService {
+
+    @Autowired
+    private RegionVGIMapper vgiMapper;
+
+    @Override
+    public List<RegionVGIVO> selectRegion() {
+        return vgiMapper.selectRegion();
+    }
+
+    @Override
+    public Integer DelRegion(String id) {
+        return vgiMapper.DelRegion(id);
+    }
+
+    @Override
+    public Integer IntoRegion(RegionVGIVO eastVO) {
+        return vgiMapper.IntoRegion(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/vo/AustraliaMiddleEastVO.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.vo;
+
+import javax.xml.crypto.Data;
+import java.lang.ref.PhantomReference;
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/19 14:50
+ */
+public class AustraliaMiddleEastVO
+{
+    private  String id;
+
+    private LocalDate yearMonth;
+
+    private  Double sstAnomalyIndex;
+
+    private  Double temperatureAnomolies;
+
+    private  Double  precipitationAnomolies;
+
+    private  Double vaiAnomolies;
+
+    private  String createdBy;
+
+    private  String createdTime;
+
+
+    public LocalDate getYearMonth() {
+        return yearMonth;
+    }
+
+    public void setYearMonth(LocalDate yearMonth) {
+        this.yearMonth = yearMonth;
+    }
+
+    public Double getSstAnomalyIndex() {
+        return sstAnomalyIndex;
+    }
+
+    public void setSstAnomalyIndex(Double sstAnomalyIndex) {
+        this.sstAnomalyIndex = sstAnomalyIndex;
+    }
+
+    public Double getTemperatureAnomolies() {
+        return temperatureAnomolies;
+    }
+
+    public void setTemperatureAnomolies(Double temperatureAnomolies) {
+        this.temperatureAnomolies = temperatureAnomolies;
+    }
+
+    public Double getPrecipitationAnomolies() {
+        return precipitationAnomolies;
+    }
+
+    public void setPrecipitationAnomolies(Double precipitationAnomolies) {
+        this.precipitationAnomolies = precipitationAnomolies;
+    }
+
+    public Double getVaiAnomolies() {
+        return vaiAnomolies;
+    }
+
+    public void setVaiAnomolies(Double vaiAnomolies) {
+        this.vaiAnomolies = vaiAnomolies;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/vo/RegionVGIVO.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.vo;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/19 16:53
+ */
+public class RegionVGIVO implements Serializable {
+    private  String id;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  String typeName;
+
+    private  String typeNameEn;
+
+    private  Double forest;
+
+    private  Double grassland;
+
+    private  Integer particularYear;
+
+    private  String createdBy;
+
+    private LocalDate createdTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeNameEn() {
+        return typeNameEn;
+    }
+
+    public void setTypeNameEn(String typeNameEn) {
+        this.typeNameEn = typeNameEn;
+    }
+
+    public Double getForest() {
+        return forest;
+    }
+
+    public void setForest(Double forest) {
+        this.forest = forest;
+    }
+
+    public Double getGrassland() {
+        return grassland;
+    }
+
+    public void setGrassland(Double grassland) {
+        this.grassland = grassland;
+    }
+
+    public Integer getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(Integer particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public LocalDate getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(LocalDate createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return "RegionVGIVO{" +
+                "id='" + id + '\'' +
+                ", region='" + region + '\'' +
+                ", regionEn='" + regionEn + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", typeNameEn='" + typeNameEn + '\'' +
+                ", forest=" + forest +
+                ", grassland=" + grassland +
+                ", particularYear=" + particularYear +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdTime=" + createdTime +
+                '}';
+    }
+}

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

@@ -0,0 +1,57 @@
+<?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.AustraliaMiddleEastMapper">
+    <resultMap id="RM_AustraliaMiddleEast" type="com.ruoyi.system.vo.AustraliaMiddleEastVO">
+
+        <result property="yearMonth" column="year_month"/>
+        <result property="id" column="ID"/>
+        <result property="sstAnomalyIndex" column="sst_anomaly_index"/>
+        <result property="temperatureAnomolies" column="temperature_anomolies"/>
+        <result property="precipitationAnomolies" column="precipitation_anomolies"/>
+        <result property="vaiAnomolies" column="vai_anomolies"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        ID,year_month,sst_anomaly_index,temperature_anomolies,precipitation_anomolies,vai_anomolies,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectAustralia" resultMap="RM_AustraliaMiddleEast">
+        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia;
+    </select>
+
+    <delete id="DelAustralia">
+        DELETE FROM central_and_eastern_australia
+        WHERE ID=#{id}
+    </delete>
+    
+    <insert id="IntoAustralia">
+        <![CDATA[
+        INSERT INTO central_and_eastern_australia (
+            ID ,
+            year_month ,
+            sst_anomaly_index ,
+            temperature_anomolies ,
+            precipitation_anomolies ,
+            vai_anomolies ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{yearMonth,jdbcType=DATE},
+                     #{sstAnomalyIndex,jdbcType=DOUBLE},
+                     #{temperatureAnomolies,jdbcType=DOUBLE},
+                     #{precipitationAnomolies,jdbcType=DOUBLE},
+                     #{vaiAnomolies,jdbcType=DOUBLE},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=VARCHAR}
+                 )
+        ]]>
+    </insert>
+</mapper> 

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

@@ -0,0 +1,65 @@
+<?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.RegionVGIMapper">
+    <resultMap id="RM_RegionVGI" type="com.ruoyi.system.vo.RegionVGIVO">
+
+        <result property="region" column="region"/>
+        <result property="id" column="ID"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typeNameEn" column="type_name_en"/>
+        <result property="forest" column="forest"/>
+        <result property="grassland" column="grassland"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,region,region_en,type_name,type_name_en,forest,created_by,created_time,grassland,particular_year
+        ]]>
+	</sql>
+
+    <select id="selectRegion" resultMap="RM_RegionVGI">
+        SELECT  <include refid="columns"/>  FROM  region_vgi;
+    </select>
+
+    <delete id="DelRegion">
+        DELETE FROM region_vgi
+        WHERE ID=#{id}
+    </delete>
+
+
+    <insert id="IntoRegion">
+        <![CDATA[
+        INSERT INTO region_vgi (
+            id,
+            region ,
+            region_en ,
+            type_name ,
+            type_name_en ,
+            forest ,
+            created_by ,
+            created_time,
+            grassland,
+            particular_year
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{region_en,jdbcType=VARCHAR},
+                     #{type_name,jdbcType=VARCHAR},
+                     #{type_name_en,jdbcType=TIMESTAMP},
+                     #{forest,jdbcType=DOUBLE},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=DATE},
+                     #{grassland,jdbcType=DOUBLE},
+                     #{particularYear}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

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

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
- 			<if test="orderNum != null and orderNum != ''">order_num,</if>
+ 			<if test="orderNum != null">order_num,</if>
  			<if test="leader != null and leader != ''">leader,</if>
  			<if test="phone != null and phone != ''">phone,</if>
  			<if test="email != null and email != ''">email,</if>
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
  			<if test="deptName != null and deptName != ''">#{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+ 			<if test="orderNum != null">#{orderNum},</if>
  			<if test="leader != null and leader != ''">#{leader},</if>
  			<if test="phone != null and phone != ''">#{phone},</if>
  			<if test="email != null and email != ''">#{email},</if>
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+ 			<if test="orderNum != null">order_num = #{orderNum},</if>
  			<if test="leader != null">leader = #{leader},</if>
  			<if test="phone != null">phone = #{phone},</if>
  			<if test="email != null">email = #{email},</if>

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

@@ -130,7 +130,7 @@
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="parentId != null">parent_id = #{parentId},</if>
-			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="path != null and path != ''">path = #{path},</if>
 			<if test="component != null">component = #{component},</if>
 			<if test="query != null">`query` = #{query},</if>
@@ -153,7 +153,7 @@
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
-		<if test="orderNum != null and orderNum != ''">order_num,</if>
+		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
 		<if test="query != null and query != ''">`query`,</if>
@@ -171,7 +171,7 @@
 		<if test="menuId != null and menuId != 0">#{menuId},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
-		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+		<if test="orderNum != null">#{orderNum},</if>
 		<if test="path != null and path != ''">#{path},</if>
 		<if test="component != null and component != ''">#{component},</if>
 		<if test="query != null and query != ''">#{query},</if>

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
         <result property="deptName"  column="dept_name"   />
+        <result property="ancestors" column="ancestors"   />
         <result property="orderNum"  column="order_num"   />
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id

ruoyi-ui/package.json

@@ -41,13 +41,13 @@
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
     "echarts": "4.9.0",
-    "element-ui": "2.15.6",
+    "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
-    "jsencrypt": "3.2.1",
+    "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

ruoyi-ui/src/plugins/tab.js

@@ -55,10 +55,10 @@ export default {
     return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
   },
   // 添加tab页签
-  openPage(title, url) {
+  openPage(title, url, params) {
     var obj = { path: url, meta: { title: title } }
     store.dispatch('tagsView/addView', obj);
-    return router.push(url);
+    return router.push({ path: url, query: params });
   },
   // 修改tab页签
   updatePage(obj) {

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 => {
+      getDictOptionselect().then(response => {
-        this.typeOptions = response.rows;
+        this.typeOptions = response.data;
       });
     },
     /** 查询字典数据列表 */

ruoyi-ui/src/views/system/user/index.vue

@@ -21,6 +21,7 @@
             :filter-node-method="filterNode"
             ref="tree"
             default-expand-all
+            highlight-current
             @node-click="handleNodeClick"
           />
         </div>

ruoyi-ui/src/views/tool/gen/index.vue

@@ -318,7 +318,9 @@ export default {
     /** 修改按钮操作 */
     handleEditTable(row) {
       const tableId = row.tableId || this.ids[0];
-      this.$router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: this.queryParams.pageNum } });
+      const tableName = row.tableName || this.tableNames[0];
+      const params = { pageNum: this.queryParams.pageNum };
+      this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params);
     },
     /** 删除按钮操作 */
     handleDelete(row) {