From 415bf078cb4f9615e9090663b7880e35817fd036 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 18:54:26 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 30 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 10
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 16 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java | 2
admin/src/utils/form.js | 33 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java | 1
server/meeting/meeting_service/src/main/resources/banner.txt | 18
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 1
admin/src/views/meeting/bookings.vue | 13
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 16
admin/src/views/meeting/components/OperaRoomsWindow.vue | 5
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 19
admin/src/api/business/member.js | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 177 ++++++++++
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 2
admin/src/views/meeting/rooms.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 4
/dev/null | 13
admin/src/components/business/OperaMemberWindow.vue | 154 +++++++++
server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java | 11
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 274 +++-------------
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 3
admin/src/views/business/internalMember.vue | 43 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java | 2
36 files changed, 571 insertions(+), 343 deletions(-)
diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index c529a5f..d7bc671 100644
--- a/admin/src/api/business/member.js
+++ b/admin/src/api/business/member.js
@@ -28,6 +28,9 @@
export function create (data) {
return request.post('/visitsAdmin/cloudService/business/member/create', data)
}
+export function memberList (data) {
+ return request.post('/visitsAdmin/cloudService/business/member/list', data)
+}
// 淇敼
export function updateById (data) {
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
new file mode 100644
index 0000000..880fb75
--- /dev/null
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -0,0 +1,154 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="60%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鎵�灞炵粍缁�" prop="companyId">
+ <el-cascader
+ v-model="form.company"
+ :options="department"
+ @change="handleChangeCompany"
+ :show-all-levels="false"
+ clearable
+ :props="departprops"
+ ></el-cascader>
+ </el-form-item>
+ <el-form-item label="鎵嬫満鍙�" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" v-trim/>
+ </el-form-item>
+ <el-form-item label="韬唤璇佸彿" prop="idcardNo" v-if="form.id ==null">
+ <el-input v-model="form.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-trim/>
+ </el-form-item>
+ <el-form-item label="淇敼韬唤璇佸彿" prop="idcardNoNew" v-if="form.id !=null">
+ <el-input v-model="form.idcardNoNew" placeholder="鍙慨鏀硅韩浠借瘉鍙�" v-trim/>
+ <div v-if="form.id !=null">
+ 锛堟敞锛氬綋鍓嶈韩浠借瘉鍙蜂负<span style="color: red">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!锛�
+ </div>
+ </el-form-item>
+ <el-form-item label="宸ュ彿" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
+ <UploadAvatarImage
+ :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }"
+ :uploadData="uploadData"
+ @uploadSuccess="uploadAvatarSuccess"
+ @uploadEnd="isUploading = false"
+ @uploadBegin="isUploading = true"
+ />
+ </el-form-item>
+</el-form>
+</GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+import {checkMobile, validIdCardNo, validIdCardNoNew} from '@/utils/form'
+export default {
+ name: 'OperaCompanyWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow, UploadAvatarImage },
+ data () {
+ return {
+ uploadData: {
+ folder: 'member'
+ },
+ departprops: {
+ label: 'name',
+ value: 'id',
+ checkStrictly: true
+ },
+ department: [],
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ name: '',
+ type: '',
+ company: [],
+ code: '',
+ idcardNo: '',
+ idcardNoNew: '',
+ linkName: '',
+ idcardDecode: '',
+ companyId: null,
+ idcardType: 0,
+ phone: '',
+ faceImg: '',
+ faceImgFull: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [{ required: true, message: '璇疯緭鍏ュ憳宸ュ鍚�', trigger: 'blur' }],
+ phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+ companyId: [{ required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�' }],
+ idcardNo: [{ required: true, validator: validIdCardNo, message: '璇疯緭鍏ヨ韩浠借瘉鍙�', trigger: 'blur' }],
+ idcardNoNew: [{ required: false, validator: validIdCardNoNew, trigger: 'blur' }]
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/member.js',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ handleChangeCompany (value) {
+ if (this.form.company && this.form.company.length > 1) {
+ this.form.companyId = this.form.company[this.form.company.length - 1]
+ }
+ },
+ /**
+ * 鎵撳紑绐楀彛
+ * @title 绐楀彛鏍囬
+ * @target 缂栬緫鐨勫璞�
+ */
+ open (title, target, depart) {
+ this.title = title
+ this.department = depart
+ this.visible = true
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ this.form.company = []
+ })
+ return
+ }
+ // 缂栬緫
+ var that = this
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ this.form.idcardNo = ''
+ }
+ this.form.company =[]
+ if (target.companyId && target.companyPath) {
+ var array = target.companyPath.split('/')
+ array.forEach(item => {
+ if (item && item != null && item != '') {
+ that.form.company.push(parseInt(item))
+ }
+ })
+ }
+ console.log(that.form.company)
+ })
+ },
+ // 涓婁紶鍥剧墖
+ uploadAvatarSuccess (file) {
+ this.form.faceImg = file.imgurl
+ this.form.faceImgFull = file.imgurlfull
+ }
+ }
+}
+</script>
diff --git a/admin/src/utils/form.js b/admin/src/utils/form.js
index 52ef5cf..bb53d89 100644
--- a/admin/src/utils/form.js
+++ b/admin/src/utils/form.js
@@ -1,7 +1,7 @@
// 楠岃瘉鎵嬫満鍙风爜
export function checkMobile (rule, value, callback) {
if (value == null || value.trim() === '') {
- callback()
+ callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙�'))
return
}
if (!/^1\d{10}$/.test(value)) {
@@ -24,8 +24,7 @@
callback()
}
-
-export function numRule(rule, value, callback) {
+export function numRule (rule, value, callback) {
// debugger
if (value == null || value < 0 || !value) {
callback(new Error())
@@ -33,7 +32,7 @@
callback()
}
}
-export function arrayRule(rule, value, callback) {
+export function arrayRule (rule, value, callback) {
// debugger
if (value == null || value.length <= 0 || !value) {
callback(new Error())
@@ -69,13 +68,31 @@
}
return
}
- let re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
+ const re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
var result = re.test(value)
- if(!result) {
+ if (!result) {
callback(new Error('璇疯緭鍏ユ纭殑绀句細淇＄敤浠ｇ爜'))
} else {
callback()
}
}
-
-
+export function validIdCardNo (rule, value, callback) {
+ const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
+ if (value == null || value.trim() ==='') {
+ callback(new Error('璇疯緭鍏ヨ韩浠借瘉鍙�'))
+ } else if (!pattern.test(value)) {
+ callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿'))
+ } else {
+ callback()
+ }
+}
+export function validIdCardNoNew (rule, value, callback) {
+ const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
+ if (value == null || value.trim() ==='') {
+ callback()
+ } else if (!pattern.test(value)) {
+ callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿'))
+ } else {
+ callback()
+ }
+}
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index a192b7c..19184f5 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -44,10 +44,13 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
+ <ul class="toolbar" v-permissions="['business:member:delete','business:member:create']">
<!-- <li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>-->
+<!--
<li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
+-->
+ <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department)" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -58,6 +61,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" label="韬唤璇佸彿" min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.sex == 1">鐢�</span>
@@ -95,10 +99,10 @@
<el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image
- v-if="row.faceImg"
+ v-if="row.faceImgFull"
style="width: 60px; height: 60px"
- :src="row.faceImg"
- :preview-src-list="[row.faceImg]">
+ :src="row.faceImgFull"
+ :preview-src-list="[row.faceImgFull]">
</el-image>
</template>
</el-table-column>
@@ -114,7 +118,9 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
</template>
</el-table-column>
</el-table>
@@ -126,6 +132,7 @@
</pagination>
<!-- 鏌ョ湅浜哄憳寮�鍗¤褰� -->
<cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
+ <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -136,12 +143,13 @@
import Pagination from '@/components/common/Pagination'
import cardOpeningRecord from '@/components/business/cardOpeningRecord'
import Tree from '@/components/common/Tree'
+import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import { fetchList } from '@/api/business/company'
import { memberSync, roleAuth } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, Tree, cardOpeningRecord },
+ components: { TableLayout1, Pagination, Tree, cardOpeningRecord,OperaMemberWindow },
data () {
return {
TreeList: [],
@@ -158,7 +166,8 @@
hasFace: ''
},
loading:false,
- companyTree: []
+ companyTree: [],
+ department:[]
}
},
created () {
@@ -196,9 +205,27 @@
this.companyTree = res
// this.searchForm.erpOrgId = res[0].erpId
this.search()
+ this.department = this.getDepartmentTree(res)
}
})
},
+ getDepartmentTree(tree) {
+ if(tree ==null){
+ return []
+ }
+ return tree.map(item => {
+ let newItem = {...item}
+ if(newItem){
+ newItem.children=newItem.childList
+ }
+ if (item.children && item.children.length == 0) {
+ this.$delete( newItem, 'children' )
+ } else {
+ newItem.children = this.getDepartmentTree(newItem.children)
+ }
+ return newItem
+ });
+ },
// 鍚屾淇℃伅
async synchronous () {
this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index e0c4f2f..2be5978 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -141,7 +141,7 @@
import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow'
import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
-import { fetchTree } from '@/api/system/department'
+import { fetchList } from '@/api/business/company'
import { cancelById, bookingsDetail } from '@/api/meeting/bookings'
export default {
name: 'Bookings',
@@ -163,7 +163,6 @@
isdeleted: '',
remark: '',
name: '',
- roomId: '',
startTime: '',
endTime: '',
content: ''
@@ -199,7 +198,7 @@
'field.id': 'id',
'field.main': 'id'
})
- fetchTree()
+ fetchList(1)
.then(res => {
this.department = this.newTree(res)
})
@@ -216,9 +215,15 @@
},
methods: {
newTree(tree) {
+ if(tree ==null){
+ return []
+ }
return tree.map(item => {
let newItem = {...item}
- if (item.children.length == 0) {
+ if(newItem){
+ newItem.children=newItem.childList
+ }
+ if (item.children && item.children.length == 0) {
this.$delete( newItem, 'children' )
} else {
newItem.children = this.newTree(newItem.children)
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index cbb22d9..a3aa091 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -42,8 +42,7 @@
v-for="item in userList()"
:key="item.id"
:value="item.id"
-
- :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+ :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
/>
</el-select>
</el-form-item>
@@ -101,7 +100,7 @@
id: null,
sysList: [],
projectList: [],
- createDate: null,
+ createDate: '',
editor: '',
editDate: null,
isdeleted: 0,
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index d75760a..b29a7c0 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -18,7 +18,7 @@
v-for="item in userList"
:key="item.id"
:value="item.id"
- :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+ :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
></el-option>
<!-- :label="`${item.department.name}-${item.realname}`" -->
<!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index eff84fa..d3a0a58 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -452,14 +452,11 @@
queryWrapper.selectAll(Bookings.class);
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
- queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
+ queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
-
- queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
- queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
-
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
queryWrapper.orderByDesc(Bookings::getCreateDate);
queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
@@ -467,7 +464,7 @@
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
- queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemDepartment::getId, pageWrap.getModel().getDepartmentId());
+ queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemUser::getId, pageWrap.getModel().getDepartmentId());
if (pageWrap.getModel().getStartTime() != null) {
queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -533,11 +530,10 @@
queryWrapper.selectAll(Bookings.class);
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
- queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
+ queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
- queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
- queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
queryWrapper.eq(queryParam.getId() != null, Bookings::getId, queryParam.getId());
queryWrapper.eq(queryParam.getRoomId() != null, Bookings::getRoomId, queryParam.getRoomId());
@@ -996,7 +992,7 @@
lambdaWrapper.selectAll(Bookings.class)
.selectAs(SystemUser::getRealname, Bookings::getRealName)
- .selectAs(SystemDepartment::getName, Bookings::getDepartmentName)
+ .selectAs(Company::getName, Bookings::getDepartmentName)
.selectAs(Rooms::getName, Bookings::getRoomName)
.select("CASE DAYOFWEEK(t.START_TIME)\n" +
"\tWHEN 1 THEN \t\"鏄熸湡鏃" \tWHEN 2 THEN \"鏄熸湡涓�\"\n" +
@@ -1010,8 +1006,7 @@
// .leftJoin(RoomTime.class, RoomTime::getId, BookingTime::getTimeId)
.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
- .leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator)
- .leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.eq(Objects.nonNull(roomId), Bookings::getRoomId, roomId)
.eq(Bookings::getIsdeleted, MeetConstants.ZERO)
.eq(Bookings::getStatus, MeetConstants.ZERO)
diff --git a/server/meeting/meeting_service/src/main/resources/banner.txt b/server/meeting/meeting_service/src/main/resources/banner.txt
index e1d9b57..e6519fd 100644
--- a/server/meeting/meeting_service/src/main/resources/banner.txt
+++ b/server/meeting/meeting_service/src/main/resources/banner.txt
@@ -2,17 +2,17 @@
${AnsiColor.BLUE}
================================================================================
- 娆㈣繋浣跨敤浼婂▋妗嗘灦锛堝崟搴旂敤鐗堬級
+ 娆㈣繋浣跨敤璞嗙背妗嗘灦锛堝崟搴旂敤鐗堬級
Version :: 1.0
- 鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅
- 鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻戔枅鈻� 鈻戔枅鈻� 鈻堚枅鈻堚枅
- 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻堚枅鈻戔枒鈻堚枅
- 鈻戔枅鈻堚枅鈻堚枅鈻堚枅 鈻戔枒鈻堚枅 鈻堚枅 鈻堚枅 鈻戔枒鈻堚枅
- 鈻戔枅鈻堚枒鈻戔枒鈻� 鈻戔枒鈻堚枅 鈻堚枅 鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅
- 鈻戔枅鈻� 鈻戔枒鈻堚枅鈻堚枅 鈻戔枅鈻堚枒鈻戔枒鈻戔枒鈻戔枅鈻�
- 鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻� 鈻戔枒鈻堚枅 鈻戔枅鈻� 鈻戔枅鈻�
- 鈻戔枒鈻戔枒鈻戔枒鈻戔枒 鈻戔枒 鈻戔枒 鈻戔枒
+ 鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅 鈻堚枅
+ 鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻堚枅 鈻戔枅鈻堚枒鈻堚枅 鈻堚枅 鈻堚枅
+ 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻堚枅 鈻戔枒鈻堚枅
+ 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枒鈻堚枅鈻堚枅 鈻戔枒鈻堚枅
+ 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枒鈻堚枅
+ 鈻戔枅鈻� 鈻堚枅 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
+ 鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻堚枒 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
+ 鈻戔枒鈻戔枒鈻戔枒鈻戔枒 鈻戔枒 鈻戔枒 鈻戔枒
鍚姩绔彛: ${server.port} 鍚姩鐜: ${project.env} 鏃ュ織绛夌骇: ${logback.level} 鍚敤Swagger: ${swagger.enabled}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java b/server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java
similarity index 88%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
rename to server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java
index 6ed1e68..9765f4d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java
@@ -1,4 +1,4 @@
-package com.doumee.dao.business;
+package com.doumee.dao.business.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Company;
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java b/server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java
new file mode 100644
index 0000000..44103cd
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java
@@ -0,0 +1,11 @@
+package com.doumee.dao.business.dao.join;
+
+import com.doumee.dao.business.model.Company;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author T14
+ */
+//@Repository
+public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
rename to server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index b165a47..2620950 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -1,15 +1,15 @@
package com.doumee.dao.business.model;
+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.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -181,9 +181,12 @@
@ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
private String hkCompanyPath;
+ @ApiModelProperty(value = "鑷缓閮ㄩ棬缂栫爜绾у埆璺緞", example = "1")
+ @ExcelColumn(name="鑷缓閮ㄩ棬缂栫爜绾у埆璺緞")
+ private String companyPath;
@ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
- private String companyPath;
+ private String companyNamePath;
@ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
@TableField(exist = false)
private String parentCompanyPath;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 8f88b2b..7b8d088 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -102,5 +102,10 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
+ private Integer companyId;
+ @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+ @TableField(exist = false)
+ private String companyName;
}
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 263c9d0..087530c 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -124,13 +124,13 @@
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
- if (pageWrap.getModel().getRootDeptId() != null) {
+ /* if (pageWrap.getModel().getRootDeptId() != null) {
pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
} else {
List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
pageWrap.getModel().setDepartmentIds(collect);
- }
+ }*/
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 78d68d6..269920c 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -5,10 +5,10 @@
<!-- 鏌ヨ鐢ㄦ埛鍒楄〃 -->
<resultMap id="SystemUserListVO" type="com.doumee.dao.system.vo.SystemUserListVO" autoMapping="true">
<id column="ID" property="id"/>
- <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
+ <!-- <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
<result column="DEPARTMENT_ID" property="id"/>
<result column="DEPARTMENT_NAME" property="name"/>
- </association>
+ </association>-->
<association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
<result column="CREATE_USER_ID" property="id"/>
<result column="CREATE_USER_NAME" property="username"/>
@@ -26,14 +26,12 @@
usr.ID, usr.BIRTHDAY, usr.EMAIL, usr.EMP_NO, usr.MOBILE, usr.AVATAR, usr.USERNAME, usr.REALNAME, usr.SEX, usr.FIXED, usr.CREATE_TIME, usr.UPDATE_TIME,
sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME
+ update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
+ sd.name as companyName
FROM `SYSTEM_USER` usr
LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
--- LEFT JOIN `SYSTEM_POSITION_USER` spu ON spu.USER_ID = usr.ID AND spu.DELETED = 0
--- LEFT JOIN `SYSTEM_POSITION` sp ON sp.ID = spu.POSITION_ID AND sp.DELETED = 0
- LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.USER_ID = usr.ID AND sdu.DELETED = 0
- LEFT JOIN `SYSTEM_DEPARTMENT` sd ON sd.ID = sdu.DEPARTMENT_ID AND sd.DELETED = 0
+ LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
<if test="dto.roleId != null">
RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
</if>
@@ -43,10 +41,10 @@
<!-- AND spu.POSITION_ID = #{dto.positionId}-->
<!-- </if>-->
<if test="dto.strictDeptId != null">
- AND sdu.DEPARTMENT_ID = #{dto.strictDeptId}
+ AND sd.ID = #{dto.strictDeptId}
</if>
<if test="dto.departmentIds != null and dto.departmentIds.size > 0">
- AND sdu.DEPARTMENT_ID IN
+ AND sd.ID IN
<foreach collection="dto.departmentIds" open="(" close=")" separator="," item="id">
#{id}
</foreach>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
index c5f8ca7..7785c41 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -58,7 +58,7 @@
@ApiOperation("鍒涘缓鍔冲姟鍏徃")
@PostMapping("/createLaborServices")
@CloudRequiredPermission("business:company:create")
- public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<Integer> createLaborServices(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
company.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(companyService.createLaborServices(company));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 1cdcdd2..7617064 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -46,8 +46,15 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:member:create")
- public ApiResponse create(@RequestBody Member member) {
- return ApiResponse.success(memberService.create(member));
+ public ApiResponse create(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
+ member.setLoginUserInfo(this.getLoginUser(token));
+ Member insert = memberService.create(member);
+ //鍒涘缓浜鸿劯淇℃伅
+ return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
+ }else{
+ return ApiResponse.failed("瀵逛笉璧凤紝鏃犳潈闄愭搷浣滐紒");
+ }
}
@PreventRepeat
@@ -117,7 +124,7 @@
@ApiOperation("鏍规嵁ID 绂佸惎鐢� ")
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateStatusById(@RequestBody Member member){
+ public ApiResponse updateStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.updateStatusById(member);
return ApiResponse.success(null);
}
@@ -125,7 +132,7 @@
@ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
@PostMapping("/updateRemoveStatusById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
+ public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(list.size()>0){
memberService.updateRemoveStatusById(list);
return ApiResponse.success(null);
@@ -138,7 +145,8 @@
@ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
@PostMapping("/updateVisitsStatusById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateVisitsStatusById(@RequestBody Member member){
+ public ApiResponse updateVisitsStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateVisitsStatusById(member);
return ApiResponse.success(null);
}
@@ -175,7 +183,7 @@
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateCanVisitById(@RequestBody Member member){
+ public ApiResponse updateCanVisitById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.updateCanVisitById(member);
return ApiResponse.success(null);
}
@@ -186,11 +194,17 @@
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findPage(pageWrap));
}
+ @ApiOperation("鏌ヨ鍏ㄩ儴")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:member:query")
+ public ApiResponse<List<Member>> findPage (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(memberService.findList(model));
+ }
@ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
@PostMapping("/findLaborMemberInfoPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
+ public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
}
@@ -220,7 +234,7 @@
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 383da4e..659794a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -90,10 +90,7 @@
* @return
*/
public static String getRootOrg() {
- Map<String, String> path = getPath(HKConstants.InterfacePath.rootOrg);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, "", null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog("",result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.rootOrg,null);
}
@@ -103,10 +100,7 @@
* @return
*/
public static String editOrg(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.editOrg);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.editOrg,body);
}
/**
@@ -115,10 +109,7 @@
* @return
*/
public static String addBatchOrg(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchOrg);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchOrg,body);
}
/**
* 鍒犻櫎缁勭粐淇℃伅
@@ -126,10 +117,7 @@
* @return
*/
public static String delOrg(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchOrg);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchOrg,body);
}
/**
@@ -138,10 +126,7 @@
* @return
*/
public static String addUser(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.addUser);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.addUser,body);
}
@@ -151,10 +136,7 @@
* @return
*/
public static String addBatchUser(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchUser);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchUser,body);
}
/**
@@ -163,10 +145,7 @@
* @return
*/
public static String delBatchUser(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchUser);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchUser,body);
}
/**
@@ -175,10 +154,7 @@
* @return
*/
public static String editUser(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.editUser);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.editUser,body);
}
/**
* 娣诲姞浜鸿劯淇℃伅
@@ -186,10 +162,7 @@
* @return
*/
public static String addFace(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.addFace);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.addFace,body);
}
/**
* 缂栬緫浜鸿劯淇℃伅
@@ -197,10 +170,7 @@
* @return
*/
public static String editFace(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.editFace);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.editFace,body);
}
/**
* 鍒犻櫎浜鸿劯淇℃伅
@@ -208,10 +178,7 @@
* @return
*/
public static String delFace(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.delFace);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.delFace,body);
}
/**
* 鍏ㄩ噺鑾峰彇杞﹀簱淇℃伅
@@ -219,10 +186,7 @@
* @return
*/
public static String parkList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.getParkList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getParkList,body);
}
/**
* 鏍规嵁杞﹀簱缂栫爜鏌ヨ鍑哄叆鍙ｅ垪琛�
@@ -230,10 +194,7 @@
* @return
*/
public static String entranceList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.getEntranceList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getEntranceList,body);
}
/**
* 杞﹁締棰勭害
@@ -241,10 +202,7 @@
* @return
*/
public static String parkAddition(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.parkAddition);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.parkAddition,body);
}
/**
* 杞﹁締鍙栨秷棰勭害
@@ -252,10 +210,7 @@
* @return
*/
public static String parkDeletion(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.parkDeletion);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.parkDeletion,body);
}
/**
* 鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛�
@@ -263,10 +218,7 @@
* @return
*/
public static String carChargeAddtion(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeAddtion);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeAddtion,body);
}
/**
* 鍥哄畾杞﹁締鍙栨秷鍖呮湡
@@ -274,10 +226,7 @@
* @return
*/
public static String carChargeDeletion(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeDeletion);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeDeletion,body);
}
@@ -305,7 +254,6 @@
* @return
*/
public static InputStream getVisitPicture(String body) throws Exception{
-
Map<String, String> path = getPath(HKConstants.InterfacePath.visitPicture);
//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
@@ -360,10 +308,7 @@
* @return
*/
public static String doorSearch(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.doorSearch);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.doorSearch,body);
}
/**
* 鑾峰彇闂ㄧ璁惧鍒楄〃
@@ -371,10 +316,7 @@
* @return
*/
public static String acsDeviceList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
}
/**
* 澧為噺鑾峰彇闂ㄧ璁惧鍒楄〃
@@ -382,10 +324,7 @@
* @return
*/
public static String acsDeviceTimeRangeList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
}
/**
* 璁垮棰勭害
@@ -393,10 +332,7 @@
* @return
*/
public static String visitAppiontment(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontment);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontment,body);
}
/**
* 璁垮鍏嶇櫥璁伴绾�
@@ -404,10 +340,7 @@
* @return
*/
public static String visitAppiontmentMDJ(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontmentMDJ);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontmentMDJ,body);
}
/**
@@ -416,10 +349,17 @@
* @return
*/
public static String visitCancel(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.visitCancel);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
+ }
+
+ public static String startDoPostStringArtemis(String pathStr,String body){
+ Map<String, String> path = getPath(pathStr);
+ Map<String, String> header = new HashMap<>();
+ header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path);
- return result;
+ return result;
+
}
/**
* 绛剧璁垮棰勭害
@@ -427,10 +367,7 @@
* @return
*/
public static String visitOut(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.visitOut);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.visitOut,body);
}
/**
* 璁垮鏉冮檺缁�
@@ -438,10 +375,7 @@
* @return
*/
public static String privilegeGroup(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.privilegeGroup);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.privilegeGroup,body);
}
/**
* 浜嬩欢璁㈤槄
@@ -449,10 +383,7 @@
* @return
*/
public static String eventSub(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.eventSub);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.eventSub,body);
}
/**
* 鍙栨秷浜嬩欢璁㈤槄
@@ -460,10 +391,7 @@
* @return
*/
public static String cancelEventSub(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.cancelEventSub);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.cancelEventSub,body);
}
/**
* 鍒涘缓涓�鍗￠�氭潈闄愪笅杞戒换鍔�
@@ -471,10 +399,7 @@
* @return
*/
public static String taskAddition(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.taskAddition);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.taskAddition,body);
}
/**
* 鏌ヨ涓�鍗￠�氭潈闄愭煡璇㈣澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呮�绘暟v2
@@ -482,10 +407,7 @@
* @return
*/
public static String taskProgress(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgress);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgress,body);
}
/**
* 鏌ヨ涓�鍗￠�氭潈闄愪笅杞戒换鍔¤繘搴�
@@ -493,10 +415,7 @@
* @return
*/
public static String taskProgressNum(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgressNum);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgressNum,body);
}
/**
* 涓�鍗￠�氭潈闄愪笅杞戒换鍔′腑娣诲姞鏁版嵁_鏍规嵁浜哄憳涓庤澶囬�氶亾鎸囧畾涓嬭浇
@@ -504,10 +423,7 @@
* @return
*/
public static String taskDataAddition(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.taskDataAddition);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.taskDataAddition,body);
}
/**
* 涓�鍗￠�氬紑濮嬩笅杞戒换鍔�
@@ -515,10 +431,7 @@
* @return
*/
public static String taskStart(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.taskStart);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.taskStart,body);
}
/**
* 鏌ヨ鏉冮檺鏉＄洰鍒楄〃
@@ -526,13 +439,7 @@
* @return
*/
public static String authItemList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.authItemList);
- Map<String, String> header = new HashMap<>();
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
-// header.put("tagId", "frs");
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.authItemList,body);
}
/**
* 鎵归噺寮�鍗�
@@ -540,11 +447,7 @@
* @return
*/
public static String cardBingding(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.cardBingding);
- Map<String, String> header = new HashMap<>();
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.cardBingding,body);
}
/**
* 閫�鍗�
@@ -552,11 +455,7 @@
* @return
*/
public static String cardDeletion(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.cardDeletion);
- Map<String, String> header = new HashMap<>();
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.cardDeletion,body);
}
/**
* 鎵归噺鎸傚け
@@ -564,11 +463,7 @@
* @return
*/
public static String cardLoss(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.cardLoss);
- Map<String, String> header = new HashMap<>();
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.cardLoss,body);
}
/**
* 鎵归噺瑙ｆ寕
@@ -576,11 +471,7 @@
* @return
*/
public static String cardUnloss(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.cardUnloss);
- Map<String, String> header = new HashMap<>();
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.cardUnloss,body);
}
/**
* 鏌ヨ璁惧閫氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯�
@@ -588,11 +479,7 @@
* @return
*/
public static String taskPersoDetail(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.taskPersoDetail);
- Map<String, String> header = new HashMap<>();
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.taskPersoDetail,body);
}
/**
@@ -601,10 +488,7 @@
* @return
*/
public static String visitingRecords(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.visitingRecords);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.visitingRecords,body);
}
/**
@@ -613,10 +497,7 @@
* @return
*/
public static String appointmentRecords(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.appointmentRecords);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.appointmentRecords,body);
}
/**
* 鑾峰彇鍏ㄩ噺缁勭粐鍒楄〃
@@ -624,10 +505,7 @@
* @return
*/
public static String orgAllList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.orgAllList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
}
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
@@ -635,10 +513,7 @@
* @return
*/
public static String userAllList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.userAllList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.userAllList,body);
}
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃2(鏍规嵁鏉′欢鍒嗛〉鏌ヨ锛�
@@ -646,10 +521,7 @@
* @return
*/
public static String personList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.personList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.personList,body);
}
/**
* 澧為噺鑾峰彇缁勭粐鍒楄〃
@@ -657,10 +529,7 @@
* @return
*/
public static String orgTimeRangeList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.orgTimeRangeList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.orgTimeRangeList,body);
}
/**
* 澧為噺鑾峰彇鐢ㄦ埛鍒楄〃
@@ -668,10 +537,7 @@
* @return
*/
public static String userTimeRangeList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.userTimeRangeList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.userTimeRangeList,body);
}
/**
* 澧為噺鑾峰彇杞﹁締鍒楄〃
@@ -679,10 +545,7 @@
* @return
*/
public static String vehicleTimeRangeList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleTimeRangeList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleTimeRangeList,body);
}
/**
* 鍏ㄩ噺鑾峰彇杞﹁締鍒楄〃
@@ -690,10 +553,7 @@
* @return
*/
public static String vehicleList(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleList,body);
}
/**
* 鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
@@ -701,21 +561,15 @@
* @return
*/
public static String parkCrossRecords(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.parkCrossRecords);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.parkCrossRecords,body);
}
/**
- * 鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
+ * 浜鸿劯璇勫垎
* @param body
* @return
*/
public static String facePictureCheck(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.facePictureCheck);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.facePictureCheck,body);
}
/**
@@ -724,10 +578,7 @@
* @return
*/
public static String acsDeviceStatus(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceStatus);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceStatus,body);
}
/**
@@ -736,10 +587,7 @@
* @return
*/
public static String tempCarInRecords(String body) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.tempCarInRecords);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(body,result,path);
- return result;
+ return startDoPostStringArtemis(HKConstants.InterfacePath.tempCarInRecords,body);
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
index 7d74f1b..a33943c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -51,6 +51,11 @@
@ApiModelProperty(value = "鍋ュ悍鐮�")
private String imgurl;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣")
+ private String faceImgFull;
+
+ @ApiModelProperty(value = "鍋ュ悍鐮佸畬鏁�")
+ private String imgurlFull;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
@@ -128,4 +133,9 @@
@ApiModelProperty(value = "闂ㄧ缁勫悕绉�")
private List<String> roleNames;
+
+ @ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
+ private String companyPath;
+ @ApiModelProperty(value = "缁勭粐璺緞")
+ private String companyNamePath;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
deleted file mode 100644
index b4fa3e0..0000000
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.doumee.dao.business.join;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.doumee.dao.business.model.Company;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author T14
- */
-//@Repository
-public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index ed6ed39..23c54e5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
@Data
@ApiModel("浜哄憳淇℃伅琛�")
@TableName("`member`")
-public class Member {
+public class Member extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -209,6 +210,12 @@
@ApiModelProperty(value = "缁勭粐鍚嶇О")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
+ @TableField(exist = false)
+ private String companyPath;
+ @ApiModelProperty(value = "缁勭粐璺緞")
+ @TableField(exist = false)
+ private String companyNamePath;
@ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
@TableField(exist = false)
private String hkOrgId;
@@ -252,4 +259,8 @@
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
private Date endTime;
+
+ @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+ @TableField(exist = false)
+ private String faceImgFull;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index cc1e70e..18cfe71 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -6,6 +6,7 @@
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
+
import java.util.List;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 4236800..d9cb5dd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -29,7 +29,7 @@
* @param member 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Member member);
+ Member create(Member member);
/**
*
@@ -70,7 +70,7 @@
* @param member 瀹炰綋瀵硅薄
*/
void updateById(Member member);
- void updateFace(Member member);
+ boolean updateFace(Member member);
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index f1c3d72..73aa6e2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -24,15 +24,14 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
-import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.join.CompanyJoinMapper;
-import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.vo.CompanyTree;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
-import com.doumee.dao.business.vo.CompanyTree;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -85,7 +84,8 @@
user = company.getLoginUserInfo();
}
String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
- company.setCompanyPath(company.getName());//鍚嶇О璺緞
+ company.setCompanyPath(company.getId()+"/");//鍚嶇О璺緞
+ company.setCompanyNamePath(company.getName());//鍚嶇О璺緞
company.setHkParentId(rootOrgId);
if(company.getParentId() !=null){
Company parent = findById(company.getParentId());
@@ -96,7 +96,8 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
}
company.setHkParentId(parent.getHkId());
- company.setCompanyPath(parent.getCompanyPath()+"/"+company.getName());
+ company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
+ company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
}
company.setHkCompanyPath(company.getCompanyPath());
company.setCreateDate(new Date());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 591a1b2..12f2c3e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -1,37 +1,21 @@
package com.doumee.service.business.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.respose.AcsDeviceInfoResponse;
-import com.doumee.core.haikang.model.param.respose.AcsDeviceListResponse;
-import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DeviceMapper;
-import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.DeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 璁惧淇℃伅琛⊿ervice瀹炵幇
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 63d795a..08af695 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -3,9 +3,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.Date;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.model.Company;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 72e455e..65ac052 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -14,7 +14,9 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.UserAddRequest;
import com.doumee.core.haikang.model.param.request.UserDelRequest;
+import com.doumee.core.haikang.model.param.respose.UserAddResponse;
import com.doumee.core.haikang.model.param.respose.UserDelResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
@@ -32,11 +34,16 @@
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemDepartment;
+import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
@@ -51,6 +58,7 @@
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
@@ -111,20 +119,166 @@
@Autowired
private VisitsMapper visitsMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Override
- public Integer create(Member member) {
- memberMapper.insert(member);
- return member.getId();
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public Member create(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
+ isMemberParamValid(member);
+ //鑾峰彇鍑虹敓鏃ユ湡
+ //鑴辨晱鎿嶄綔
+ Member insert = initAddMemberModel(member,loginUserInfo);
+ //娴峰悍浜哄憳鏂板涓氬姟
+ if(dealHkUserBiz(insert)){
+ try {
+ memberMapper.insert(insert);
+ //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+ createSystemUser(insert);
+ }catch (Exception e){
+ //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+ deleteHkUserBiz(insert.getHkId());
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鏂板缓澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ return insert;
+ }
+ private void createSystemUser(Member insert) {
+ SystemUser user = new SystemUser();
+ // 鐢熸垚瀵嗙爜鐩�
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ // 鐢熸垚瀵嗙爜
+ user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
+ user.setSalt(salt);
+
+ // 鍒涘缓鐢ㄦ埛璁板綍
+ user.setType(insert.getType());
+ user.setUsername(insert.getPhone());
+ user.setEmpNo(insert.getCode());
+ user.setRealname(insert.getName());
+ user.setCompanyId(insert.getCompanyId());
+ user.setMobile(insert.getPhone());
+ user.setCreateTime(insert.getCreateDate());
+ user.setCreateUser(insert.getCreator());
+ user.setUpdateUser(insert.getEditor());
+ user.setUpdateTime(insert.getEditDate());
+ user.setMemberId(insert.getId());
+ user.setDeleted(Boolean.FALSE);
+ user.setFixed(Boolean.FALSE);
+ user.setStatus(Constants.ZERO);
+ systemUserMapper.insert(user);
+ }
+
+ private Member initAddMemberModel(Member member, LoginUserInfo loginUserInfo) {
+ Member insert= new Member();
+ insert.setCreator(loginUserInfo.getId());
+ insert.setCreateDate(new Date());
+ insert.setEditor(loginUserInfo.getId());
+ insert.setEditDate(new Date());
+ insert.setIsdeleted(Constants.ZERO);
+ insert.setCompanyId(member.getCompanyId());
+ insert.setFaceImg(member.getFaceImg());
+ insert.setImgurl(member.getImgurl());
+ insert.setCode(member.getCode());
+ insert.setType(Constants.TWO);
+ insert.setHkDate(new Date());
+ insert.setName(member.getName());
+ insert.setHkStatus(Constants.ONE);
+ insert.setSex(IdcardUtil.getGenderByIdCard(member.getIdcardNo()) ==1?Constants.TWO:Constants.ONE);//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ insert.setBirthday( DateUtil.parse(IdcardUtil.getBirthByIdCard(member.getIdcardNo()), "yyyyMMdd"));
+ insert.setPhone(member.getPhone());
+ insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
+ insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
+ insert.setStatus(Constants.ZERO);
+ return insert;
+ }
+
+ /**
+ * 鍒犻櫎娴峰悍浜哄憳淇℃伅
+ * @param hkId
+ */
+ private void deleteHkUserBiz(String hkId) {
+ UserDelRequest request = new UserDelRequest();
+ request.setPersonIds(new String[]{hkId});
+ BaseResponse<List<UserDelResponse>> result = HKService.delBatchUser(request);
+ }
+
+ /**
+ * 娴峰悍浜哄憳鏂板涓氬姟
+ * @param insert
+ * @return
+ */
+ private boolean dealHkUserBiz(Member insert) {
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ Company company = companyMapper.selectById(insert.getCompanyId());
+ if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ if(StringUtils.isBlank(company.getHkId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+ }
+ insert.setHkOrgId(company.getHkId());
+ UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
+ if(hkAddRequest == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝浜鸿劯鐓х墖鏈夎锛岃灏濊瘯閲嶆柊涓婁紶锛�");
+ }
+ //澶勭悊鏂板鏁版嵁
+ BaseResponse<UserAddResponse> result = HKService.addUser(hkAddRequest);
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ insert.setHkId(hkAddRequest.getPersonId());
+ insert.setFaceId(result.getData().getFaceId());
+ if(StringUtils.isNotBlank(insert.getFaceId())){
+ insert.setFaceStatus(Constants.ONE);
+ }else{
+ insert.setFaceStatus(Constants.ZERO);
+ }
+ return true;
+ }else if(result!=null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚屾瀹夐槻骞冲彴澶辫触銆�"+result.getMsg()+"銆戯紝璇疯仈绯荤鐞嗗憳锛�");
+ }
+ return false;
+ }
+
+ private void isMemberParamValid(Member member) {
+ if (!PhoneUtil.isPhone(member.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+ }
+ if (!IdcardUtil.isValidCard(member.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
+ }
+
+ SystemUser systemUser = new SystemUser();
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setUsername(member.getPhone());
+ queryUserDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+systemUser.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ // 楠岃瘉宸ュ彿
+ if (StringUtils.isNotBlank(member.getCode())) {
+ queryUserDto = new SystemUser();
+ queryUserDto.setDeleted(Boolean.FALSE);
+ queryUserDto.setEmpNo(member.getCode());
+ user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
+ }
+ }
}
@Transactional
@Override
public Integer laborMemberCreate(LaborMemberDTO member) {
-
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
if (PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
@@ -296,7 +450,7 @@
memberMapper.updateById(member);
}
@Override
- public void updateFace(Member member) {
+ public boolean updateFace(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
wrapper.lambda().ne(Member::getRemark,"浜鸿劯宸插悓姝ユ渶鏂�");
List<Member> list =memberMapper.selectList(wrapper);
@@ -312,9 +466,11 @@
update.setRemark("浜鸿劯宸插悓姝ユ渶鏂�");
update.setFaceStatus(Constants.ONE);
memberMapper.updateById(update);
+ return true;
}
}
}
+ return false;
}
@Override
public void delHkForce(Member member) {
@@ -460,7 +616,6 @@
queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
-
List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
if(list!=null){
for(Member m : list){
@@ -654,7 +809,7 @@
.having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
- memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
+ memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode()) ==1?Constants.TWO:Constants.ONE));
}
return PageData.from(memberIPage);
}
@@ -690,6 +845,8 @@
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Company::getName,Member::getCompanyName);
+ queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
+ queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
@@ -731,10 +888,10 @@
memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
//鎷兼帴鍓嶇紑
if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
- memberInfoDTO.setFaceImg(prefixUrl + memberInfoDTO.getFaceImg());
+ memberInfoDTO.setFaceImgFull(prefixUrl + memberInfoDTO.getFaceImg());
}
if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
- memberInfoDTO.setImgurl(prefixUrl + memberInfoDTO.getImgurl());
+ memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
}
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index bbbe3e2..0392a44 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -7,9 +7,9 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.ProblemLogJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index 0a7c27b..a23d069 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.TrainTimeJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.TrainTime;
-import com.doumee.dao.business.model.Visits;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TrainTimeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
index 689fbb9..bace142 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -2,13 +2,11 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.UserActionMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.ParkBook;
import com.doumee.dao.business.model.UserAction;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.UserActionService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 4b0213e..708828c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -30,6 +30,7 @@
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.DeviceJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index bf7dfda..dbef628 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -30,6 +30,7 @@
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 9af2a01..a6ea67e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -16,6 +16,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ext.ERPSyncService;
@@ -855,10 +856,11 @@
}
}
- private UserAddRequest getUserAddModel(Member c,String path,int type) {
+ public static UserAddRequest getUserAddModel(Member c,String path,int type) {
UserAddRequest model = new UserAddRequest();
model.setOrgIndexCode(c.getHkOrgId());
model.setJobNo(c.getCode());
+ model.setPhoneNo(c.getPhone());
model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
model.setPersonId(type == 0 ?UUID.randomUUID().toString().replace("-", ""):c.getHkId());
@@ -874,7 +876,6 @@
}
face.setFaceData(imageBase);
model.getFaces().add(face);
-
}
return model;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
index e598615..df05a04 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
@@ -17,6 +17,7 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
index 4f8ce59..0ef439e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
@@ -21,6 +21,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Visits;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
index d92e58f..4679a06 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
@@ -16,9 +16,9 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Visits;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
--
Gitblit v1.9.3