Merge remote-tracking branch 'origin/uat' into lc_alert_upvote

suishenbang-admin/src/main/resources/application-dev-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-                username: root
-                password: libang
+            url: jdbc:mysql://10.32.2.212:3306/suishenbang_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+            username: root
+            password: libang
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -36,7 +36,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -44,8 +44,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
@@ -55,4 +55,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

suishenbang-admin/src/main/resources/application-dev.yml

@@ -129,11 +129,11 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Shiro
 shiro:
@@ -150,7 +150,7 @@ shiro:
     captchaType: math
   cookie:
     # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
+    domain:
     # 设置cookie的有效访问路径
     path: /
     # 设置HttpOnly属性
@@ -170,7 +170,7 @@ shiro:
     kickoutAfter: false
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）

suishenbang-admin/src/main/resources/application-uat-druid.yml

@@ -13,9 +13,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 10
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -43,8 +43,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

suishenbang-admin/src/main/resources/application-uat.yml

@@ -27,9 +27,9 @@ customer:
 #hana数据库数据同步配置
 hana:
   hana-driver: com.sap.db.jdbc.Driver
-  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
+  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
   hana-user: SSB_HANA
-  hana-pwd: Erty567*
+  hana-pwd: s$EW12445T
   mysql-driver: com.mysql.jdbc.Driver
   mysql-url: jdbc:mysql://pc-uf637rafh16b6nl16.rwlb.rds.aliyuncs.com:3306/ssbtest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
   mysql-user: ssbtest
@@ -59,7 +59,7 @@ server:
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
     basedir: /tmp/tomcat
- 
+
 # 日志配置
 logging:
   level:
@@ -139,11 +139,11 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Shiro
 shiro:
@@ -160,7 +160,7 @@ shiro:
     captchaType: math
   cookie:
     # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
+    domain:
     # 设置cookie的有效访问路径
     path: /
     # 设置HttpOnly属性
@@ -180,7 +180,7 @@ shiro:
     kickoutAfter: false
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）

suishenbang-admin/src/main/resources/static/ruoyi/js/common.js

@@ -1,9 +1,9 @@
 /**
  * 通用方法封装处理
- * Copyright (c) 2019 ruoyi 
+ * Copyright (c) 2019 ruoyi
  */
 $(function() {
-	
+
 	//  layer扩展皮肤
 	if (window.layer !== undefined) {
 		layer.config({
@@ -11,7 +11,7 @@ $(function() {
 		    skin: 'layer-ext-moon'
 		});
 	}
-	
+
 	// select2复选框事件绑定
 	if ($.fn.select2 !== undefined) {
         $.fn.select2.defaults.set( "theme", "bootstrap" );
@@ -21,7 +21,7 @@ $(function() {
 			})
 		})
 	}
-	
+
 	// iCheck单选框及复选框事件绑定
 	if ($.fn.iCheck !== undefined) {
 		$(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
@@ -31,7 +31,7 @@ $(function() {
             })
         })
 	}
-	 
+
 	// laydate 时间控件绑定
 	if ($(".select-time").length > 0) {
 		layui.use('laydate', function() {
@@ -226,7 +226,7 @@ function createMenuItem(dataUrl, menuName) {
         // 添加选项卡对应的iframe
         var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" data-panel="' + panelUrl + '" seamless></iframe>';
         $('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
-        
+
         window.parent.$.modal.loading("数据加载中，请稍后...");
         $('.mainContent iframe:visible', topWindow).load(function () {
         	window.parent.$.modal.closeLoading();

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html

@@ -248,8 +248,8 @@
             contentType: false,
             success: function (result) {
                 if (result.code == 0) {
-                    photoUrl = result.data.url;
-                    $("#div-bgUrl").html("<img src='" + result.data.url + "' style='width:300px;margin-bottom: 5px;'>");
+                    photoUrl = result.data.fileName;
+                    $("#div-bgUrl").html("<img src='" + result.data.fileName + "' style='width:300px;margin-bottom: 5px;'>");
                 } else {
                     $.modal.alertWarning(result.msg);
                 }
@@ -370,4 +370,4 @@
     }
 </script>
 </body>
-</html>
+</html>

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

@@ -36,7 +36,7 @@
                     <textarea id="alertContent" name="alertContent" class="form-control">[[*{alertContent}]]</textarea>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">弹框开始时间：</label>
                 <div class="col-sm-8">
                     <input id="alertStartTime" name="alertStartTime" th:value="${#dates.format(alertConfiguration.alertStartTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="datetime-local">
@@ -46,7 +46,7 @@
                     <!--</div>-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">弹框结束时间：</label>
                 <div class="col-sm-8">
                     <input id="alertEndTime" name="alertEndTime" th:value="${#dates.format(alertConfiguration.alertEndTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="datetime-local">
@@ -56,7 +56,7 @@
                     <!--</div>-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">弹框每日可弹次数：</label>
                 <div class="col-sm-8">
                     <input name="alertNum" th:field="*{alertNum}" class="form-control" type="number">
@@ -435,8 +435,8 @@
                 contentType: false,
                 success: function (result) {
                     if (result.code == 0) {
-                        photoUrl = result.data.url;
-                        $("#div-bgUrl").html("<img src='" + result.data.url + "' style='width:300px;margin-bottom: 5px;'>");
+                        photoUrl = result.data.fileName;
+                        $("#div-bgUrl").html("<img src='" + result.data.fileName + "' style='width:300px;margin-bottom: 5px;'>");
                     } else {
                         $.modal.alertWarning(result.msg);
                     }
@@ -500,4 +500,4 @@
         }
     </script>
 </body>
-</html>
+</html>

suishenbang-framework/src/main/java/com/dgtly/framework/shiro/session/OnlineSessionDAO.java

@@ -14,7 +14,7 @@ import com.dgtly.framework.shiro.service.SysShiroService;
 
 /**
  * 针对自定义的ShiroSession的db操作
- * 
+ *
  * @author ruoyi
  */
 public class OnlineSessionDAO extends EnterpriseCacheSessionDAO

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -168,9 +168,10 @@ public class RyTask
      * @author: njs
      * @date: 2023/6/16 10:26
      */
-    public void  salesOrderBaseByCreditStatus() {
+  /*  public void  salesOrderBaseByCreditStatus(){
         HanaSalesOrderService.updateSalesOrderBaseNoCrditStatus();
-    }
+    }*/
+
 
     /**
      * @description: 业绩进度指标预警邮件/企微消息通知

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -105,6 +105,10 @@ public class HanaOrderComponent {
                 "                T.POSID, \n" +
                 "               T.PD_NO,\n"+
                 "\t replace(replace(T.BSTKD,CHAR(10),''),CHAR(13),'') BSTKD, \n" +
+                "               T.NETPR,\n"+
+                "               T.NTGEW_MARA,\n"+
+                "               T.PSTYV,\n"+
+                "               T.UEPOS, \n"+
                 "\t replace(replace(T.BSTKD_E,CHAR(10),''),CHAR(13),'') BSTKD_E \n" +
                 "FROM (\n" +
                 "\n" +
@@ -157,6 +161,10 @@ public class HanaOrderComponent {
                 "                A.POSID, "+
                 "               A.PD_NO, "+
                 "               A.BSTKD,"+
+                "               A.NETPR, "+
+                "               A.NTGEW_MARA,"+
+                "               A.PSTYV,"+
+                "               A.UEPOS,"+
                 "                A.BSTKD_E "+
                 "FROM \"_SYS_BIC\".\"com.sd/CAL_SALES\"" +
                 "('PLACEHOLDER' = ('$$IP_ENDDATE$$',\n" +
@@ -363,6 +371,10 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("POSID")
                                 +"$$"+ result.getString("PD_NO")
                                 +"$$"+ result.getString("BSTKD")
+                                +"$$"+ result.getString("NETPR")
+                                +"$$"+ result.getString("NTGEW_MARA")
+                                +"$$"+ result.getString("PSTYV")
+                                +"$$"+ result.getString("UEPOS")
                                 +"$$"+ result.getString("BSTKD_E")
                                 + "\r\n");