完善风险监测

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/entity/MetricMonitorSetHistory.java

@@ -32,7 +32,6 @@ public class MetricMonitorSetHistory implements Serializable {
 
     /**id*/
     @TableId(type = IdType.AUTO)
-    
     private java.lang.Integer id;
 
     /**指标名称*/
@@ -147,20 +146,13 @@ public class MetricMonitorSetHistory implements Serializable {
     private java.lang.String noticeReceiveMiddle;
 
     @Excel(name = "高风险消息接收人", width = 15)
-    
     private java.lang.String noticeReceiveHight;
 
-    
     private java.lang.String createBy;
 
-    
     private java.util.Date createTime;
 
-
     @TableField(exist = false)
     private String domainName;
 
-
-
-
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/entity/MetricStatReport.java

 package org.jeecg.modules.stm.metric.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -108,4 +109,7 @@ public class MetricStatReport implements Serializable {
     @Dict(dicCode="metric_sta_method")
     private Integer statMethod;
 
+    @TableField(exist = false)
+    private String[] otherData;
+
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/mapper/xml/MetricMonitorSetHightMapper.xml

-<?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="org.jeecg.modules.stm.metric.mapper.MetricMonitorSetHightMapper">
-
-</mapper>
\ No newline at end of file

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/utils/CreateWordUtil.java

@@ -172,7 +172,7 @@ public class CreateWordUtil {
             out.flush();
             out.close();
             template.close();
-            return StmConstans.METRIC_REPORT_SAVE_PATH + File.separator + fileName;
+            return StmConstans.METRIC_REPORT_SAVE_PATH + "/" + fileName;
         } catch (Exception e) {
            throw e;
         } finally {

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/resources/mapping/metric/MetricStatReportMapper.xml

 <?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="org.stm.metric.mapper.MetricStatReportMapper">
+<mapper namespace="org.jeecg.modules.stm.metric.mapper.MetricStatReportMapper">
     <select id="queryMetricStatByDomain" resultType="java.util.Map">
         SELECT
             IFNULL(D.domain_code, -1) AS code,

zrch-risk-server-39/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -75,9 +75,7 @@ public class LoginController {
 	 * 线程池用于异步发送纪要
 	 */
 	public static ExecutorService cachedThreadPool = new ShiroThreadPoolExecutor(0, 1024, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
-
 	
-
 	@Operation(summary="登录接口")
 	@RequestMapping(value = "/login", method = RequestMethod.POST)
 	public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel, HttpServletRequest request){