From d151ab96d31e8c581f71e9185d895d1a589e829c Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:45:35 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/zq-erp
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html | 12 +-
zq-erp/src/main/resources/config/lhx/config.json | 94 +++++++++++++++
zq-erp/src/main/resources/static/js/systools/ChartsUtils.js | 56 +++++++++
zq-erp/pom.xml | 6 +
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 2
zq-erp/src/main/resources/config/lhx/application.properties | 60 ++++++++++
zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java | 9 +
zq-erp/src/main/resources/config/lhx/system.properties | 104 +++++++++++++++++
8 files changed, 333 insertions(+), 10 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 4f2e0b0..9dba746 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -53,6 +53,12 @@
<env>xcx</env>
</properties>
</profile>
+ <profile>
+ <id>lhx</id>
+ <properties>
+ <env>lhx</env>
+ </properties>
+ </profile>
</profiles>
<dependencies>
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
index c25461f..69a4dc0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
@@ -4,6 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hiveErp.analysUtil.*;
@@ -112,8 +113,12 @@
//获取所有门店
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- List<SysShopInfo> shops= shopInfoDao.selectShopInfo(user.getCompanyId());
-
+ List<SysShopInfo> shops=null;
+ if(DataAuthUtil.hasAllShopAuth()){
+ shops= shopInfoDao.selectShopInfo(user.getCompanyId());
+ }else{
+ shops=Arrays.asList(shopInfoDao.selectById(user.getShopId()));
+ }
//定义数据项内容
List<SeriesVo> series=new ArrayList<>();
diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
new file mode 100644
index 0000000..3aead90
--- /dev/null
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -0,0 +1,60 @@
+evn=lhx
+server.port=8080
+
+
+#线上测试环境
+spring.datasource.username=ct_test
+spring.datasource.password=123456
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+
+
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.initialSize=3
+spring.datasource.minIdle=3
+spring.datasource.maxActive=20
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=true
+spring.datasource.testOnReturn=true
+spring.datasource.filters=stat,wall,log4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.thymeleaf.prefix: classpath:/templates/views/
+spring.thymeleaf.cache=false
+mybatis.config-location=classpath:mybatis/mybatis-config.xml
+mybatis.mapper-locations=classpath*:mybatis/mapper/*/*.xml
+#设置全局时间返回格式 第三行设置为true表示返回时间戳
+#spring.jackson.date-format=yyyy-MM-dd
+#spring.jackson.time-zone=GMT+8
+#spring.jackson.serialization.write-dates-as-timestamps=true
+#文件上传时的大小限制 单位M
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+#--------------------------------------
+
+
+#rabbitMQ配置
+rabbitmq.host=120.27.238.55
+rabbitmq.port=5672
+rabbitmq.username=ct_rabbit
+rabbitmq.password=123456
+useRabbit=false
+
+server.session.timeout=120
+
+ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
+ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
+ali.sms.regionId=cn-hangzhou
+ali.sms.signName=\u80bd\u598d
+
+#hour
+activities.groupBuy.limit=24
+#minute
+groupBuy.pay.timeLimit=30
+#定时任务
+scheduling.enabled=true
+
+swagger.enable=false
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/lhx/config.json b/zq-erp/src/main/resources/config/lhx/config.json
new file mode 100644
index 0000000..1b5f059
--- /dev/null
+++ b/zq-erp/src/main/resources/config/lhx/config.json
@@ -0,0 +1,94 @@
+/* 前后端通信相关的配置,注释只允许使用多行方式 */
+{
+ /* 上传图片配置项 */
+ "imageActionName": "uploadimage", /* 执行上传图片的action名称 */
+ "imageFieldName": "upfile", /* 提交的图片表单名称 */
+ "imageMaxSize": 2048000, /* 上传大小限制，单位B */
+ "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
+ "imageCompressEnable": true, /* 是否压缩图片,默认是true */
+ "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
+ "imageInsertAlign": "none", /* 插入的图片浮动方式 */
+ "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
+ "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+ /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
+ /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
+ /* {time} 会替换成时间戳 */
+ /* {yyyy} 会替换成四位年份 */
+ /* {yy} 会替换成两位年份 */
+ /* {mm} 会替换成两位月份 */
+ /* {dd} 会替换成两位日期 */
+ /* {hh} 会替换成两位小时 */
+ /* {ii} 会替换成两位分钟 */
+ /* {ss} 会替换成两位秒 */
+ /* 非法字符 \ : * ? " < > | */
+ /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
+
+ /* 涂鸦图片上传配置项 */
+ "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
+ "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
+ "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+ "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
+ "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
+ "scrawlInsertAlign": "none",
+
+ /* 截图工具上传 */
+ "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
+ "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+ "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
+ "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
+
+ /* 抓取远程图片配置 */
+ "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
+ "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
+ "catcherFieldName": "source", /* 提交的图片列表表单名称 */
+ "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+ "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
+ "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
+ "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
+
+ /* 上传视频配置 */
+ "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
+ "videoFieldName": "upfile", /* 提交的视频表单名称 */
+ "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+ "videoUrlPrefix": "http://127.0.0.1:1088/uploadeFile/", /* 视频访问路径前缀 */
+ "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
+ "videoAllowFiles": [
+ ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+ ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
+
+ /* 上传文件配置 */
+ "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
+ "fileFieldName": "upfile", /* 提交的文件表单名称 */
+ "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+ "fileUrlPrefix": "http://127.0.0.1:1088/uploadeFile/", /* 文件访问路径前缀 */
+ "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
+ "fileAllowFiles": [
+ ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+ ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+ ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+ ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+ ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+ ], /* 上传文件格式显示 */
+
+ /* 列出指定目录下的图片 */
+ "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
+ "imageManagerListPath": "http://127.0.0.1:1088/uploadeFile/", /* 指定要列出图片的目录 */
+ "imageManagerListSize": 20, /* 每次列出文件数量 */
+ "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
+ "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
+ "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
+
+ /* 列出指定目录下的文件 */
+ "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
+ "fileManagerListPath": "http://127.0.0.1:1088/uploadeFile/", /* 指定要列出文件的目录 */
+ "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
+ "fileManagerListSize": 20, /* 每次列出文件数量 */
+ "fileManagerAllowFiles": [
+ ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+ ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+ ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+ ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+ ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+ ] /* 列出的文件类型 */
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/lhx/system.properties b/zq-erp/src/main/resources/config/lhx/system.properties
new file mode 100644
index 0000000..ffeb78d
--- /dev/null
+++ b/zq-erp/src/main/resources/config/lhx/system.properties
@@ -0,0 +1,104 @@
+#是否启用debug模式
+debug=false
+# 日志文件保存地址
+log_path=/home/javaweb/hive/log
+
+# 系统语言环境 zh中文，us英文
+system_language=zh
+
+# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
+error_password_times=5
+# 默认密码
+default_password=123
+
+#nginx静态资源访问地址
+static_resource_url=http://120.27.238.55:8000/hive/static/uploadeFile/
+#文件保存地址
+file_storage_path=/home/javaweb/webresource/hive/static/uploadeFile/
+#文件上传大小字节为单位 10MB
+maxUploadSize=10485760
+
+#Matser\u7684ip\u5730\u5740
+redis.hostname=120.27.238.55
+#\u7AEF\u53E3\u53F7
+redis.port=6379
+#\u5982\u679C\u6709\u5BC6\u7801
+redis.password=xcong123
+#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
+redis.timeout=10000
+redis.database=2
+redis_time_out=1800000
+
+
+cookie_time_out=36000
+
+#APP登录公钥
+login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
+#APP登录秘钥
+login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
+
+#是否启用异常上报
+is_open_exception_report=true
+showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+
+#异常上报地址
+exception_center_url =http://geek.xc.jyymatrix.cc/addException
+#项目编号
+projNo=78
+#项目负责人
+owner=姜友瑶
+
+#日志文件清理阈值 单位：MB
+log_max=20
+#日志清理天数
+log_clear_day=5
+
+
+
+
+wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+xcx_appid =wx3836ab3c1490ff29
+xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
+
+#微信支付调试开关
+wx_pay_debug_onoff = false
+
+#快递鸟用户id
+logistics.eBusinessID=1530881
+#快递鸟密钥
+logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
+#快递鸟接口地址
+logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+#快递鸟接口指令
+logistics.requestType=1002
+
+#丰桥顾客编码
+sf.logistics.clientCode=XCZHYF
+#丰桥校验码
+sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW
+#丰桥接口地址
+sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
+
+#发送短信配置
+crm.request_url = http://192.168.1.248
+sms.request_url = http://smssh1.253.com
+sms.login_account = M7315130
+sms.login_password = J7FAoehPkv63e3
+sms.login_accountNe = N4617160
+sms.login_passwordNe = rb1cxLitRB83e0
+
+#接入统一登录平台配置
+platform_app_code = wx_shop
+platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
+#platform_verity_url = http://localhost:8080/platform/getUserInfo
+platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
+
+#微信支付回调地址
+pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
+
+
+qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+#hive仓库地址
+hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/
diff --git a/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js b/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js
index 93a7553..cb5a624 100644
--- a/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js
+++ b/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js
@@ -11,7 +11,6 @@
this.$unitSelect = $("#unitSelect");
//记录当前视图的格式化字符串
this.dateFmt = "";
-
//绑定搜索事件
$('#serach').on("click",{charts:this},this.updateChartsDate);
//时间单位选择变化
@@ -119,3 +118,58 @@
event.data.charts.loadChartData();
}
}
+
+/**
+ *指定图表的配置项和数据
+ */
+ChartsUtils.prototype.getption=function(title) {
+ return {
+ title: {
+ text: title,
+ padding: 20
+ },
+ legend: {},
+ toolbox: {
+ show: true,
+ feature: {
+ mark: {show: true},
+ dataView: {show: true, readOnly: false},
+ magicType: {show: true, type: ['line', 'bar']},
+ restore: {show: true},
+ saveAsImage: {show: true}
+ }
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ axisLabel: {
+ rotate: 30
+ },
+ splitLine: {
+ show: false,
+ },
+ data: []
+ },
+ yAxis: {
+ type: 'value'
+ },
+ dataZoom: [
+ {
+ id: 'dataZoomX',
+ type: 'slider',
+ xAxisIndex: [0],
+ filterMode: 'filter'
+ }
+ ],
+ animation: true,
+ animationDuration: 1000,
+ animationDurationUpdate: 1000,
+ animationEasing: 'linear',
+ animationEasingUpdate: 'linear',
+ }
+
+};
+
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
index 53c9190..2cbe29c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
@@ -141,12 +141,12 @@
var myChart1 = echarts.init(document.getElementById('echarts-line-chart1'), 'macarons');
var myChart2 = echarts.init(document.getElementById('echarts-line-chart2'), 'macarons');
var myChart3 = echarts.init(document.getElementById('echarts-line-chart3'), 'macarons');
- /*
- 点击事件
- myChart1.on('click', function (params) {
- console.log(params);
- });
-*/
+ /*
+ 点击事件
+ myChart1.on('click', function (params) {
+ console.log(params);
+ });
+ */
// 指定图表的配置项和数据
function getption() {
return {
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
index 3f879e8..cb72dd9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
@@ -208,7 +208,7 @@
};
- function exportExcelexportExcel(){
+ function exportExcel(){
var param=MForm.toUrlParam("#serchform");
--
Gitblit v1.9.1