From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
platform_web/.env.production | 12 -
platform_web/src/views/login.vue | 7
screen_standard/.env.lingyang | 5 +
screen_standard/vite.config.js | 2
server/src/main/resources/application-standardLingyang.yml | 54 ++++++++++
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 3
platform_web/.env.lingyang | 17 +++
screen_standard/package.json | 1
server/src/main/resources/mappers/SystemUserMapper.xml | 11 ++
h5_standard/.env.production | 4
server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java | 16 +++
server/src/main/java/doumeemes/config/shiro/ShiroToken.java | 3
h5_standard/src/views/tabPage/my.vue | 6 +
platform_web/src/components/common/CommonHeader.vue | 5
h5_standard/public/redirect.html | 6 +
screen_standard/.env.development | 5
h5_standard/src/views/LogInAgain.vue | 6 +
h5_standard/src/views/children.vue | 4
platform_web/src/views/business/clientManger.vue | 21 ++-
server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 22 ++++
web_standard/.env.production | 4
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 3
h5_standard/.env | 4
.idea/dmMes.iml | 9 +
h5_standard/.env.development | 8 +
platform_web/.env.development | 14 ++
web_standard/.env.lingyang | 16 +++
screen_standard/.env.production | 4
server/src/main/resources/application.yml | 2
platform_web/package.json | 1
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 6 +
31 files changed, 248 insertions(+), 33 deletions(-)
diff --git a/.idea/dmMes.iml b/.idea/dmMes.iml
index d6ebd48..73e8f54 100644
--- a/.idea/dmMes.iml
+++ b/.idea/dmMes.iml
@@ -5,5 +5,14 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library" exported="">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/server/lib/antelope-other-client-20230203.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
\ No newline at end of file
diff --git a/h5_standard/.env b/h5_standard/.env
index d1bac03..7cb66b3 100644
--- a/h5_standard/.env
+++ b/h5_standard/.env
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
# 鎺ュ彛鍓嶇紑 _api_api_test
+=======
+# 鎺ュ彛鍓嶇紑 _api
+>>>>>>> 1.0.3
VUE_APP_API_PREFIX = '/api'
# 涓婁笅鏂囪矾寰� --> 榛樿./锛堝彲浠ラ儴缃插湪鏈嶅姟鍣ㄤ换鎰忚矾寰勶級
diff --git a/h5_standard/.env.development b/h5_standard/.env.development
index 5dda2b4..9694782 100644
--- a/h5_standard/.env.development
+++ b/h5_standard/.env.development
@@ -11,20 +11,28 @@
# 钀嶅鏈湴
<<<<<<< HEAD
+<<<<<<< HEAD
# VUE_APP_API = 'http://192.168.3.219:10021/'
=======
VUE_APP_API = 'http://192.168.3.219:10021/'
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+# VUE_APP_API = 'http://192.168.3.219:10021/'
+>>>>>>> 1.0.3
# 浠诲悍鏈湴
# VUE_APP_API = 'http://192.168.0.15:10021/'
# VUE_APP_API = 'http://192.168.0.127:10021/'
<<<<<<< HEAD
+<<<<<<< HEAD
VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
=======
#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+>>>>>>> 1.0.3
# VUE_APP_API = 'http://192.168.0.13:10012/'
diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index 9d57589..f783c6a 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -18,9 +18,13 @@
# VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'
# 娴嬭瘯
+<<<<<<< HEAD
# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
#VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
+=======
+#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+>>>>>>> 1.0.3
# 婕旂ず
VUE_APP_API = 'https://www.mes.red/api/'
diff --git a/h5_standard/public/redirect.html b/h5_standard/public/redirect.html
index edfbff1..cea29c7 100644
--- a/h5_standard/public/redirect.html
+++ b/h5_standard/public/redirect.html
@@ -9,10 +9,16 @@
var url = window.location.href
if (url.indexOf('?code') === -1) {
let query = url.split('?')[1]
+<<<<<<< HEAD
let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
// let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
// let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
// let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+=======
+ // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ let tempUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+>>>>>>> 1.0.3
window.location.replace(tempUrl)
} else {
var code = url.substring(url.indexOf('?') + 6, url.indexOf('&'))
diff --git a/h5_standard/src/views/LogInAgain.vue b/h5_standard/src/views/LogInAgain.vue
index ec6d831..e597995 100644
--- a/h5_standard/src/views/LogInAgain.vue
+++ b/h5_standard/src/views/LogInAgain.vue
@@ -91,6 +91,7 @@
uuid: '0000',
code: '0000'
})
+<<<<<<< HEAD
// let res = await testLogin({ // 鏂囨
// username: '18656077929',
// password: '123456',
@@ -101,6 +102,11 @@
// let res = await testLogin({ // 寮犵楂�
// username: '15256913207',
// password: '123456',
+=======
+ // let res = await testLogin({ // 寮犵楂�
+ // username: '15256913207',
+ // password: '123456',
+>>>>>>> 1.0.3
// companyId: '8',
// uuid: '0000',
// code: '0000'
diff --git a/h5_standard/src/views/children.vue b/h5_standard/src/views/children.vue
index 33b1751..2dfd23e 100644
--- a/h5_standard/src/views/children.vue
+++ b/h5_standard/src/views/children.vue
@@ -37,10 +37,14 @@
const title = ref<string>('')
<<<<<<< HEAD
+<<<<<<< HEAD
// alert(window.document.title)
=======
alert(window.document.title)
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+ // alert(window.document.title)
+>>>>>>> 1.0.3
const pathLists = reactive<string[]>([
'/index',
'/workbench',
diff --git a/h5_standard/src/views/tabPage/my.vue b/h5_standard/src/views/tabPage/my.vue
index 33d1794..394407c 100644
--- a/h5_standard/src/views/tabPage/my.vue
+++ b/h5_standard/src/views/tabPage/my.vue
@@ -78,10 +78,16 @@
}).then(res => {
if (res.code === 200) {
// window.parent.postMessage('闃垮悍', '*')
+<<<<<<< HEAD
let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
// let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
// let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
// let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+=======
+ // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+ // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+ let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+>>>>>>> 1.0.3
window.open(href)
// window.location.replace(href)
}
diff --git a/platform_web/.env.development b/platform_web/.env.development
index 3b927e6..580425f 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -21,6 +21,18 @@
#鐒︽澗
#VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
+<<<<<<< HEAD
#浠诲悍鏈湴
VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
-# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
\ No newline at end of file
+# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+=======
+#鍒樼纾婃湰鍦�
+# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
+VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+
+# # 鎺ュ彛鍓嶇紑
+# VUE_APP_API_PREFIX = '/doumeeplant/'
+
+# #姝ｅ紡鐜
+VUE_APP_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant/'
+>>>>>>> 1.0.3
diff --git a/platform_web/.env.lingyang b/platform_web/.env.lingyang
new file mode 100644
index 0000000..fce2351
--- /dev/null
+++ b/platform_web/.env.lingyang
@@ -0,0 +1,17 @@
+# 鐢熶骇鐜閰嶇疆
+NODE_ENV = 'production'
+
+# 鍏抽棴DEBUG
+VUE_APP_DEBUG = 'off'
+
+# 璺敱鏂瑰紡
+VUE_APP_ROUTER_MODE = 'hash'
+
+# 椤圭洰涓婁笅鏂囪矾寰�
+VUE_APP_CONTEXT_PATH = '/admin'
+
+# 鎺ュ彛鍓嶇紑
+VUE_APP_API_PREFIX = '/doumeeplant/'
+
+#姝ｅ紡鐜
+VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'
diff --git a/platform_web/.env.production b/platform_web/.env.production
index d4ef849..e616577 100644
--- a/platform_web/.env.production
+++ b/platform_web/.env.production
@@ -9,15 +9,9 @@
# 椤圭洰涓婁笅鏂囪矾寰�
VUE_APP_CONTEXT_PATH = '/admin'
-
-
# 鎺ュ彛鍓嶇紑
-VUE_APP_API_PREFIX = '/doumeeplant/'
-
-#娴嬭瘯鏈嶅姟鍣�
-#VUE_APP_BASE_URL = 'http://139.186.142.91:10012/'
-#婕旂ず鏈嶅姟鍣�
-# VUE_APP_BASE_URL = 'http://121.41.112.139:10012/'
+VUE_APP_API_PREFIX = '/api/'
#姝ｅ紡鐜
-VUE_APP_BASE_URL = 'https://www.mes.red/doumeeplant/'
+VUE_APP_BASE_URL = 'https://www.mes.red/api/'
+
diff --git a/platform_web/package.json b/platform_web/package.json
index 543f479..a3f3eca 100644
--- a/platform_web/package.json
+++ b/platform_web/package.json
@@ -5,6 +5,7 @@
"scripts": {
"serve": "vue-cli-service serve",
"build:pro": "vue-cli-service build",
+ "build:ly": "vue-cli-service build --mode lingyang",
"build:dev": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint",
"fix": "eslint --ext .js,.vue src --fix"
diff --git a/platform_web/src/components/common/CommonHeader.vue b/platform_web/src/components/common/CommonHeader.vue
index 647b628..37f8e15 100644
--- a/platform_web/src/components/common/CommonHeader.vue
+++ b/platform_web/src/components/common/CommonHeader.vue
@@ -149,10 +149,11 @@
logout()
.then(() => {
this.setUserInfo(null)
- this.$router.push({ name: 'login' })
+ // this.$router.push({ path: '/login' })
+ window.location.reload()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ this.$tips.apiFailed(e)
})
}
}
diff --git a/platform_web/src/views/business/clientManger.vue b/platform_web/src/views/business/clientManger.vue
index 4c2d44c..8543327 100644
--- a/platform_web/src/views/business/clientManger.vue
+++ b/platform_web/src/views/business/clientManger.vue
@@ -1,6 +1,6 @@
<template>
<!-- :permissions="['business:appliancechange:query']" -->
- <TableLayout>
+ <TableLayout :permissions="['ext:companyext:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" label-suffix="锛�" inline>
<el-form-item label="瀹㈡埛鍚嶇О" prop="name">
@@ -26,11 +26,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <!-- v-permissions="['ext:workorderrecordext:exportExcel']" -->
- <li><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '鏂板瀹㈡埛')">鏂板</el-button></li>
+ <!-- -->
+ <li v-permissions="['ext:companyext:create']"><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '鏂板瀹㈡埛')">鏂板</el-button></li>
<!-- <li><el-button type="primary" @click="exportExcel">璋冩暣鏈夋晥鏈�</el-button></li> -->
<li><el-button type="primary" @click="resetUserPwd">閲嶇疆涓昏处鍙峰瘑鐮�</el-button></li>
- <li><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
+ <li v-permissions="['ext:companyext:delete']"><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border
@selection-change="handleSelectionChange">
@@ -65,13 +65,16 @@
:inactive-value="0" @change="statusChange(row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" min-width="220px" fixed="right">
+ <el-table-column
+ v-if="containPermissions(['ext:companyext:update', 'ext:companyext:delete'])"
+
+ label="鎿嶄綔" align="center" min-width="220px" fixed="right">
<template slot-scope="{ row }">
<!-- <el-button type="text" @click="$refs.operaClientMangerWindow.open('缂栬緫瀹㈡埛', row)">缂栬緫</el-button> -->
- <el-button type="text" @click="showDetail(row, true)">缂栬緫</el-button>
- <el-button type="text" @click="$refs.operaClientValidDateWindow.open('璋冩暣', row)">璋冩暣</el-button>
- <el-button type="text" @click="$refs.operaDDSettingWindow.open('閽夐拤閰嶇疆', row)">閽夐拤閰嶇疆</el-button>
- <el-button type="text" style="color:red" :loading="isWorking.delete"
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="showDetail(row, true)">缂栬緫</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaClientValidDateWindow.open('璋冩暣', row)">璋冩暣</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaDDSettingWindow.open('閽夐拤閰嶇疆', row)">閽夐拤閰嶇疆</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:delete']" style="color:red" :loading="isWorking.delete"
@click="deleteById(row, false)">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/platform_web/src/views/login.vue b/platform_web/src/views/login.vue
index 596213f..3729f58 100644
--- a/platform_web/src/views/login.vue
+++ b/platform_web/src/views/login.vue
@@ -46,7 +46,6 @@
loading: false,
username: '',
password: '',
- companyId: 8,
// 楠岃瘉鐮�
captcha: {
loading: false,
@@ -78,11 +77,13 @@
username: this.username.trim(),
password: this.password,
code: this.captcha.value.trim(),
- companyId: this.companyId,
uuid: this.captcha.uuid
})
.then(() => {
- window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ // console.log(process.env.VUE_APP_CONTEXT_PATH);
+ // b7121c39-e109-472f-bb89-722b91289437
+ // window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ window.location.reload()
})
.catch(e => {
this.refreshCaptcha()
diff --git a/screen_standard/.env.development b/screen_standard/.env.development
index 5c3ce22..891725e 100644
--- a/screen_standard/.env.development
+++ b/screen_standard/.env.development
@@ -6,11 +6,10 @@
#VITE_BASE_URL='http://192.168.0.35:10021'
# VITE_BASE_PATH='/doumeeplant_api'
-<<<<<<< HEAD
# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
-=======
+
VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'
# VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
->>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
+VITE_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant'
diff --git a/screen_standard/.env.lingyang b/screen_standard/.env.lingyang
new file mode 100644
index 0000000..065edca
--- /dev/null
+++ b/screen_standard/.env.lingyang
@@ -0,0 +1,5 @@
+NODE_ENV = production
+VITE_NAME = '鐢熶骇鐜'
+VITE_BASE_CONTEXT = 'screen'
+VITE_BASE_PATH = '/doumeeplant/'
+VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
diff --git a/screen_standard/.env.production b/screen_standard/.env.production
index e332e9c..bf4afcd 100644
--- a/screen_standard/.env.production
+++ b/screen_standard/.env.production
@@ -1,5 +1,5 @@
NODE_ENV = production
VITE_NAME = '鐢熶骇鐜'
VITE_BASE_CONTEXT = 'screen'
-VITE_BASE_PATH = '/api'
-VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
\ No newline at end of file
+VITE_BASE_PATH = '/api/'
+VITE_BASE_URL = 'https://www.mes.red/api'
diff --git a/screen_standard/package.json b/screen_standard/package.json
index b2560d6..268a0ac 100644
--- a/screen_standard/package.json
+++ b/screen_standard/package.json
@@ -5,6 +5,7 @@
"scripts": {
"serve": "vite --mode development",
"build:pro": "vite build --mode production",
+ "build:ly": "vite build --mode lingyang",
"build:dev": "vite build --mode staging",
"preview": "vite preview"
},
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index bf4e9bc..a1d9926 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -43,7 +43,7 @@
// 鏈湴杩愯閰嶇疆锛屽強鍙嶅悜浠ｇ悊閰嶇疆
server: {
host: '192.168.0.3',
- port: '8080',
+ port: '1801',
cors: true, // 榛樿鍚敤骞跺厑璁镐换浣曟簮
open: true, // 鍦ㄦ湇鍔″櫒鍚姩鏃惰嚜鍔ㄥ湪娴忚鍣ㄤ腑鎵撳紑搴旂敤绋嬪簭
//鍙嶅悜浠ｇ悊閰嶇疆锛屾敞鎰弐ewrite鍐欐硶锛屽紑濮嬫病鐪嬫枃妗ｅ湪杩欓噷韪╀簡鍧�
diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index 00e7705..396d18f 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -6,10 +6,14 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
+<<<<<<< HEAD
import doumeemes.dao.business.model.Backorder;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
+=======
+import doumeemes.dao.ext.dto.CompanyLoginDTO;
+>>>>>>> 1.0.3
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -50,6 +54,24 @@
@RequiresPermissions("system:loginLog:query")
public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織_"+System.currentTimeMillis(),"鐧诲綍鏃ュ織-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+<<<<<<< HEAD
+=======
+ }
+
+
+ @PostMapping("/companyLoginStatisticsPage")
+ @ApiOperation("浼佷笟鐧诲綍缁熻")
+// @RequiresPermissions("system:loginLog:query")
+ public ApiResponse<PageData<CompanyLoginStatisticsVO>> companyLoginStatisticsPage (@RequestBody PageWrap<CompanyLoginDTO> pageWrap) {
+ return ApiResponse.success(systemUserService.companyLoginStatisticsPage(pageWrap));
+ }
+
+ @PostMapping("/companyLoginStatisticsExport")
+ @ApiOperation("浼佷笟鐧诲綍缁熻瀵煎嚭")
+// @RequiresPermissions("system:loginLog:query")
+ public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+>>>>>>> 1.0.3
}
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
index 14b3889..cdc6b69 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -1,6 +1,9 @@
package doumeemes.config.shiro;
+<<<<<<< HEAD
import doumeemes.core.model.LoginUserInfo;
+=======
+>>>>>>> 1.0.3
import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.stereotype.Component;
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
index a0363b0..e384763 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
@@ -17,6 +17,7 @@
public class CompanyLoginStatisticsVO {
@ApiModelProperty(value = "鏃堕棿 yyyy-MM-dd")
+<<<<<<< HEAD
@ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
private String dataDate;
@@ -30,6 +31,21 @@
@ApiModelProperty(value = "鐧诲綍娆℃暟")
@ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
+=======
+ @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER)
+ private String dataDate;
+
+ @ApiModelProperty(value = "鐧诲綍浼佷笟鍚嶇О")
+ @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 6,align = HorizontalAlignment.CENTER)
+ private String companyName;
+
+ @ApiModelProperty(value = "娓犻亾")
+ @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER)
+ private Integer orgin;
+
+ @ApiModelProperty(value = "鐧诲綍娆℃暟")
+ @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER)
+>>>>>>> 1.0.3
private Integer loginNum;
}
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
index 1ebb2e2..eacb013 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -90,6 +90,7 @@
@ExcelColumn(name="鐧诲綍鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
private Date loginTime;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
@ApiModelProperty(value = "浼佷笟鍚嶇О")
@ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
@@ -102,4 +103,6 @@
private String companyUserName;
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+>>>>>>> 1.0.3
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index ed3ee89..ac34454 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -137,6 +137,9 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
+// BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
+// s.divide(new BigDecimal(0),2);
+// model.setSalary(s.doubleValue());
}
}
return PageData.from(new PageInfo<>(result));
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
index a3c21da..87cac8d 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,7 +4,10 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+<<<<<<< HEAD
import doumeemes.core.utils.DateUtil;
+=======
+>>>>>>> 1.0.3
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -198,9 +201,12 @@
@Override
public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
+<<<<<<< HEAD
if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
}
+=======
+>>>>>>> 1.0.3
return systemUserMapper.activityLoginVOList(activityLoginDTO);
}
diff --git a/server/src/main/resources/application-standardLingyang.yml b/server/src/main/resources/application-standardLingyang.yml
new file mode 100644
index 0000000..3ea0111
--- /dev/null
+++ b/server/src/main/resources/application-standardLingyang.yml
@@ -0,0 +1,54 @@
+# WEB鏈嶅姟鍣ㄩ厤缃� 婕旂ず鐜
+server:
+ port: 10021
+ servlet:
+ session:
+ timeout: PT3H #琛ㄧず12灏忔椂
+
+spring:
+ # 鏁版嵁婧愰厤缃�
+
+ datasource:
+ url: jdbc:mysql://192.168.10.147:3306/doumee_mes_standard?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: Doumee@168_com
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+
+ # rabbitmq:
+ # host: amqp-cn-7mz2o4ddz00c.cn-hangzhou.amqp-2.net.mq.amqp.aliyuncs.com
+ # port: 5672
+ # username: MjphbXFwLWNuLTdtejJvNGRkejAwYzpMVEFJNXQ3QzFjdXJUNnlleGNoc1hMZWo=
+ # password: RkEwNjMzNUM5MTBENzE2QjQyQzE4OTc1ODREMEU5NzA4ODFBMkQ2NjoxNjUwOTU0NjI4MjYx
+ # virtual-host: mqtest
+
+ # redis:
+ # # database: 0
+ # host: r-m5ece8e1y7649odr2xpd.redis.rds.aliyuncs.com
+ # port: 6379
+ # password: doumee:doumee@168
+ # timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ redis:
+ # database: 0
+ host: 192.168.10.186
+ port: 6379
+ password: Doumee@168_com
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: doumee@168.com
+debug_model: true
+
+captcha_check: true
+
+# Swagger閰嶇疆
+swagger:
+ host:
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
\ No newline at end of file
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f8bd246..ae670ec 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: doumeemes
profiles:
- active: standardPro
+ active: standardLingyang
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/src/main/resources/mappers/SystemUserMapper.xml b/server/src/main/resources/mappers/SystemUserMapper.xml
index 57d6361..4bfdd26 100644
--- a/server/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/src/main/resources/mappers/SystemUserMapper.xml
@@ -72,7 +72,11 @@
</resultMap>
<select id="activityLoginVOList" parameterType="doumeemes.dao.ext.dto.ActivityLoginDTO" resultMap="ActivityLoginVO">
+<<<<<<< HEAD
select a.DATA_DATE , count(b.id) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
+=======
+ select a.DATA_DATE , count(1) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
+>>>>>>> 1.0.3
FROM mysql.help_topic
WHERE TIMESTAMPDIFF(DAY,CONCAT(#{dto.startDate}),CONCAT(#{dto.endDate})) > help_topic_id ) a
left join
@@ -97,11 +101,18 @@
FROM `system_login_log` s left join company c on s.COMPANY_ID = c.ID
<where>
s.COMPANY_ID is not null
+<<<<<<< HEAD
and s.SUCCESS = 1
and s.ORGIN is not null
<if test="dto.orgin != null">
AND s.orgin = #{dto.orgin}
</if>
+=======
+ <if test="dto.orgin != null">
+ AND s.orgin = #{dto.orgin}
+ </if>
+
+>>>>>>> 1.0.3
<if test="dto.companyName != null and dto.companyName != ''">
AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
</if>
diff --git a/web_standard/.env.lingyang b/web_standard/.env.lingyang
new file mode 100644
index 0000000..3243928
--- /dev/null
+++ b/web_standard/.env.lingyang
@@ -0,0 +1,16 @@
+# 鐢熶骇鐜閰嶇疆
+NODE_ENV = 'production'
+
+# 鍏抽棴DEBUG
+VUE_APP_DEBUG = 'off'
+
+# 璺敱鏂瑰紡
+VUE_APP_ROUTER_MODE = 'hash'
+
+# 椤圭洰涓婁笅鏂囪矾寰�
+VUE_APP_CONTEXT_PATH = '/web/'
+
+# 鎺ュ彛鍓嶇紑
+VUE_APP_API_PREFIX = '/doumeeplant/'
+
+VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'
diff --git a/web_standard/.env.production b/web_standard/.env.production
index b575403..632e436 100644
--- a/web_standard/.env.production
+++ b/web_standard/.env.production
@@ -11,6 +11,6 @@
VUE_APP_CONTEXT_PATH = '/web/'
# 鎺ュ彛鍓嶇紑
-VUE_APP_API_PREFIX = '/doumeeplant'
+VUE_APP_API_PREFIX = '/api/'
-VUE_APP_BASE_URL = 'https://www.mes.red/doumeeplant/'
+VUE_APP_BASE_URL = 'https://www.mes.red/api/'
--
Gitblit v1.9.3