Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
207cf344
Commit
207cf344
authored
Feb 28, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:去除无效好办2.0引用
parent
ac556257
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
74 additions
and
505 deletions
+74
-505
StatusEnum.java
...main/java/com/gic/haoban/manage/api/enums/StatusEnum.java
+24
-0
pom.xml
haoban-manage3-operation-web/pom.xml
+4
-29
WebBaseController.java
...m/gic/haoban/manage/web/controller/WebBaseController.java
+0
-40
MenuDetailResponse.java
...om/gic/haoban/manage/web/response/MenuDetailResponse.java
+0
-41
RoleDetailResponse.java
...om/gic/haoban/manage/web/response/RoleDetailResponse.java
+0
-34
pom.xml
haoban-manage3-service/pom.xml
+26
-47
AuditApiServiceImpl.java
.../manage/service/service/out/impl/AuditApiServiceImpl.java
+0
-0
DepartmentApiServiceImpl.java
...ge/service/service/out/impl/DepartmentApiServiceImpl.java
+18
-29
KafkaMessageServiceImpl.java
...c/haoban/manage/service/task/KafkaMessageServiceImpl.java
+1
-11
pom.xml
haoban-manage3-web/pom.xml
+0
-0
WebBaseController.java
...m/gic/haoban/manage/web/controller/WebBaseController.java
+0
-25
MenuDetailResponse.java
...om/gic/haoban/manage/web/response/MenuDetailResponse.java
+0
-41
RoleDetailResponse.java
...om/gic/haoban/manage/web/response/RoleDetailResponse.java
+0
-34
WebLoginResponse.java
.../com/gic/haoban/manage/web/response/WebLoginResponse.java
+0
-33
dubbo-haoban-manage-web.xml
...3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
+0
-2
pom.xml
haoban-manage3-wx/pom.xml
+1
-38
WebBaseController.java
...m/gic/haoban/manage/web/controller/WebBaseController.java
+0
-26
MenuDetailResponse.java
...om/gic/haoban/manage/web/response/MenuDetailResponse.java
+0
-41
RoleDetailResponse.java
...om/gic/haoban/manage/web/response/RoleDetailResponse.java
+0
-34
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/StatusEnum.java
0 → 100644
View file @
207cf344
package
com
.
gic
.
haoban
.
manage
.
api
.
enums
;
/**
* Created by hua on 2018/7/18.
*/
public
enum
StatusEnum
{
ALL
(-
1
),
DEL
(
0
),
NORMAL
(
1
),
Preview
(
2
);
private
int
value
;
StatusEnum
(
int
value
)
{
this
.
value
=
value
;
}
public
int
getValue
()
{
return
value
;
}
public
void
setValue
(
int
value
)
{
this
.
value
=
value
;
}
}
haoban-manage3-operation-web/pom.xml
View file @
207cf344
...
...
@@ -115,11 +115,7 @@
<artifactId>
haoban-contacts-manage-api
</artifactId>
<version>
${haoban-contacts-manage-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-auth-api
</artifactId>
<version>
${haoban-auth-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-operation-api
</artifactId>
...
...
@@ -141,41 +137,19 @@
<artifactId>
gic-thirdparty-api
</artifactId>
<version>
${gic-thirdparty-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-message-api
</artifactId>
<version>
${haoban-message-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-app-announcement-api
</artifactId>
<version>
${haoban-app-announcement-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-communicate-api
</artifactId>
<version>
${haoban-communicate-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-mobile-app-api
</artifactId>
<version>
${haoban-mobile-app-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-thirdparty-sdk
</artifactId>
<version>
${gic-thirdparty-sdk}
</version>
</dependency>
<dependency>
<groupId>
com.gic.operation
</groupId>
<artifactId>
gic-operation-api
</artifactId>
<version>
${gic-operation-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-enterprise-api
</artifactId>
...
...
@@ -204,6 +178,7 @@
<artifactId>
sharing-core-api
</artifactId>
<version>
${sharing-core-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-app-customer-api
</artifactId>
...
...
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
View file @
207cf344
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO
;
import
com.gic.haoban.auth.api.dto.UserRightDetailDTO
;
import
com.gic.haoban.common.utils.AuthRequestUtil
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
org.apache.commons.collections.CollectionUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* Created 2018/7/18.
...
...
@@ -41,38 +34,5 @@ public class WebBaseController {
response
.
setErrorCode
(
errCode
.
getCode
());
return
response
;
}
/**
* 获取登陆信息
*
* @return
*/
protected
UserRightDetailDTO
getLoginUser
()
{
return
(
UserRightDetailDTO
)
AuthRequestUtil
.
getSessionUser
();
}
public
boolean
haveRight
(
List
<
DisplayRelationShortInfoDTO
>
list
){
List
<
String
>
groupList
=
new
ArrayList
<
String
>();
List
<
String
>
storeList
=
new
ArrayList
<
String
>();
List
<
String
>
clerkList
=
new
ArrayList
<
String
>();
if
(
list
==
null
){
return
false
;
}
for
(
DisplayRelationShortInfoDTO
showDto
:
list
){
if
(
showDto
.
getGroupId
()!=
null
){
groupList
.
add
(
showDto
.
getGroupId
());
}
if
(
showDto
.
getStoreId
()!=
null
){
storeList
.
add
(
showDto
.
getStoreId
());
}
if
(
showDto
.
getClerkId
()!=
null
){
clerkList
.
add
(
showDto
.
getClerkId
());
}
}
if
(
CollectionUtils
.
isEmpty
(
groupList
)
&&
CollectionUtils
.
isEmpty
(
storeList
)
&&
CollectionUtils
.
isEmpty
(
clerkList
)){
return
false
;
}
return
true
;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.auth.api.dto.MenuRightDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/27.
*
* @author hua
*/
public
class
MenuDetailResponse
implements
Serializable
{
private
MenuRightDTO
top
;
private
List
<
MenuRightDTO
>
leftMenu
;
private
MenuRightDTO
current
;
public
MenuRightDTO
getTop
()
{
return
top
;
}
public
void
setTop
(
MenuRightDTO
top
)
{
this
.
top
=
top
;
}
public
List
<
MenuRightDTO
>
getLeftMenu
()
{
return
leftMenu
;
}
public
void
setLeftMenu
(
List
<
MenuRightDTO
>
leftMenu
)
{
this
.
leftMenu
=
leftMenu
;
}
public
MenuRightDTO
getCurrent
()
{
return
current
;
}
public
void
setCurrent
(
MenuRightDTO
current
)
{
this
.
current
=
current
;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.auth.api.dto.MenuRightInfoDTO
;
import
com.gic.haoban.auth.api.dto.RoleDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/17.
*
* @author hua
*/
public
class
RoleDetailResponse
implements
Serializable
{
public
RoleDTO
role
;
public
List
<
MenuRightInfoDTO
>
menuRightList
;
public
RoleDTO
getRole
()
{
return
role
;
}
public
void
setRole
(
RoleDTO
role
)
{
this
.
role
=
role
;
}
public
List
<
MenuRightInfoDTO
>
getMenuRightList
()
{
return
menuRightList
;
}
public
void
setMenuRightList
(
List
<
MenuRightInfoDTO
>
menuRightList
)
{
this
.
menuRightList
=
menuRightList
;
}
}
\ No newline at end of file
haoban-manage3-service/pom.xml
View file @
207cf344
...
...
@@ -46,12 +46,12 @@
<groupId>
com.gic
</groupId>
<artifactId>
haoban-common
</artifactId>
<version>
${haoban-common}
</version>
<exclusions>
<exclusion>
<artifactId>
log4j
</artifactId>
<groupId>
log4j
</groupId>
</exclusion>
</exclusions>
<exclusions>
<exclusion>
<artifactId>
log4j
</artifactId>
<groupId>
log4j
</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
...
...
@@ -78,22 +78,7 @@
<artifactId>
haoban-task-api
</artifactId>
<version>
${haoban-task-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-contacts-api
</artifactId>
<version>
${haoban-contacts-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-contacts-manage-api
</artifactId>
<version>
${haoban-contacts-manage-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-auth-api
</artifactId>
<version>
${haoban-auth-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-enterprise-api
</artifactId>
...
...
@@ -106,34 +91,28 @@
</exclusions>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-communicate-api
</artifactId>
<version>
${haoban-communicate-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-message-api
</artifactId>
<version>
${haoban-message-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-wechat-api
</artifactId>
<version>
${gic-wechat-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-communicate-api
</artifactId>
<version>
${haoban-communicate-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-wechat-api
</artifactId>
<version>
${gic-wechat-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-clerk-api
</artifactId>
<version>
${gic-clerk-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-search-engine-api
</artifactId>
<version>
${gic-search-engine-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-member-api
</artifactId>
...
...
@@ -147,7 +126,7 @@
<version>
${gic-thirdparty-api}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-app-customer-api
</artifactId>
<version>
${haoban-app-customer-api}
</version>
...
...
@@ -169,9 +148,9 @@
<version>
5.5.1
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
sql-check-sdk
</artifactId>
<version>
${sql-check-sdk}
</version>
<groupId>
com.gic
</groupId>
<artifactId>
sql-check-sdk
</artifactId>
<version>
${sql-check-sdk}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
...
...
@@ -180,7 +159,7 @@
<scope>
compile
</scope>
</dependency>
</dependencies>
<build>
<finalName>
haoban-manage3-service
</finalName>
<plugins>
...
...
@@ -233,6 +212,6 @@
</executions>
</plugin>
</plugins>
</build>
</project>
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
View file @
207cf344
This diff is collapsed.
Click to expand it.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
View file @
207cf344
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
cn.hutool.core.collection.CollectionUtil
;
import
com.gic.haoban.base.api.common.Constant
;
import
com.gic.haoban.base.api.common.ServiceResponse
;
import
com.gic.haoban.manage.api.dto.*
;
import
com.gic.haoban.manage.api.enums.SecretTypeEnum
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.service.service.*
;
import
com.gic.redis.data.anno.RedisCache
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.JSONResponse
;
import
com.gic.api.base.commons.Page
;
import
com.gic.commons.util.EntityUtil
;
...
...
@@ -39,19 +13,34 @@ import com.gic.enterprise.api.dto.StoreGroupDTO;
import
com.gic.enterprise.api.service.StoreGroupService
;
import
com.gic.enterprise.api.service.StoreService
;
import
com.gic.haoban.base.api.common.BasePageInfo
;
import
com.gic.haoban.base.api.common.Constant
;
import
com.gic.haoban.base.api.common.ServiceResponse
;
import
com.gic.haoban.common.utils.PageUtil
;
import
com.gic.haoban.common.utils.StringUtil
;
import
com.gic.haoban.contacts.manage.api.dto.SyncJsonColumnDTO
;
import
com.gic.haoban.manage.api.dto.*
;
import
com.gic.haoban.manage.api.enums.SecretTypeEnum
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.service.dao.mapper.DepartmentMapper
;
import
com.gic.haoban.manage.service.entity.TabHaobanDepartment
;
import
com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated
;
import
com.gic.haoban.manage.service.entity.TabHaobanSyncErrorLog
;
import
com.gic.haoban.manage.service.
entity.TabHaobanWxEnterpriseRelated
;
import
com.gic.haoban.manage.service.
service.*
;
import
com.gic.haoban.manage.service.task.RouterConstant
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.wechat.api.service.qywx.QywxDepartmentApiService
;
import
com.github.pagehelper.PageHelper
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Service
public
class
DepartmentApiServiceImpl
implements
DepartmentApiService
{
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java
View file @
207cf344
...
...
@@ -10,26 +10,19 @@ import com.gic.commons.util.EntityUtil;
import
com.gic.commons.util.GICMQClientUtil
;
import
com.gic.dubbo.entity.ProviderLocalTag
;
import
com.gic.haoban.base.api.common.ServiceResponse
;
import
com.gic.haoban.contacts.manage.api.enums.StatusEnum
;
import
com.gic.haoban.manage.api.dto.FlushStoreMqDTO
;
import
com.gic.haoban.manage.api.dto.StaffClerkBindLogInfoDTO
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.api.enums.ChannelCodeEnum
;
import
com.gic.haoban.manage.api.enums.StatusEnum
;
import
com.gic.haoban.manage.api.service.StaffClerkRelationApiService
;
import
com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService
;
import
com.gic.haoban.manage.service.pojo.BinlogBasePojo
;
import
com.gic.haoban.manage.service.pojo.ClerkSyncPojo
;
import
com.gic.haoban.manage.service.pojo.GroupSyncPojo
;
import
com.gic.haoban.manage.service.pojo.StoreSyncPojo
;
import
com.gic.haoban.manage.service.service.StaffClerkBindLogService
;
import
com.gic.haoban.manage.service.service.StaffClerkRelationService
;
import
com.gic.haoban.manage.service.service.StoreRangeService
;
import
com.gic.haoban.task.api.dto.MqMessageQo
;
import
com.gic.mq.sdk.exception.RouterException
;
import
com.gic.qcloud.cmq.CMQClientException
;
import
com.gic.qcloud.cmq.CMQServerException
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.apache.kafka.clients.consumer.ConsumerRecord
;
import
org.slf4j.Logger
;
...
...
@@ -58,9 +51,6 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
private
StaffClerkRelationService
staffClerkRelationService
;
@Autowired
private
StaffClerkBindLogService
staffClerkBindLogService
;
@Autowired
private
StaffClerkRelationApiService
staffClerkRelationApiService
;
@Autowired
...
...
haoban-manage3-web/pom.xml
View file @
207cf344
This diff is collapsed.
Click to expand it.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
View file @
207cf344
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.common.utils.EntityUtil
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.manage.api.dto.LoginDTO
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
org.apache.commons.collections.CollectionUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* Created 2018/7/18.
...
...
@@ -54,24 +49,4 @@ public class WebBaseController {
return
EntityUtil
.
changeEntityByJSON
(
LoginDTO
.
class
,
AuthWebRequestUtil
.
getLoginUser
());
}
public
boolean
haveRight
(
List
<
DisplayRelationShortInfoDTO
>
list
)
{
List
<
String
>
groupList
=
new
ArrayList
<
String
>();
List
<
String
>
storeList
=
new
ArrayList
<
String
>();
List
<
String
>
clerkList
=
new
ArrayList
<
String
>();
if
(
list
==
null
)
{
return
false
;
}
for
(
DisplayRelationShortInfoDTO
showDto
:
list
)
{
if
(
showDto
.
getGroupId
()
!=
null
)
{
groupList
.
add
(
showDto
.
getGroupId
());
}
if
(
showDto
.
getStoreId
()
!=
null
)
{
storeList
.
add
(
showDto
.
getStoreId
());
}
if
(
showDto
.
getClerkId
()
!=
null
)
{
clerkList
.
add
(
showDto
.
getClerkId
());
}
}
return
!
CollectionUtils
.
isEmpty
(
groupList
)
||
!
CollectionUtils
.
isEmpty
(
storeList
)
||
!
CollectionUtils
.
isEmpty
(
clerkList
);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.auth.api.dto.MenuRightDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/27.
*
* @author hua
*/
public
class
MenuDetailResponse
implements
Serializable
{
private
MenuRightDTO
top
;
private
List
<
MenuRightDTO
>
leftMenu
;
private
MenuRightDTO
current
;
public
MenuRightDTO
getTop
()
{
return
top
;
}
public
void
setTop
(
MenuRightDTO
top
)
{
this
.
top
=
top
;
}
public
List
<
MenuRightDTO
>
getLeftMenu
()
{
return
leftMenu
;
}
public
void
setLeftMenu
(
List
<
MenuRightDTO
>
leftMenu
)
{
this
.
leftMenu
=
leftMenu
;
}
public
MenuRightDTO
getCurrent
()
{
return
current
;
}
public
void
setCurrent
(
MenuRightDTO
current
)
{
this
.
current
=
current
;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.auth.api.dto.MenuRightInfoDTO
;
import
com.gic.haoban.auth.api.dto.RoleDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/17.
*
* @author hua
*/
public
class
RoleDetailResponse
implements
Serializable
{
public
RoleDTO
role
;
public
List
<
MenuRightInfoDTO
>
menuRightList
;
public
RoleDTO
getRole
()
{
return
role
;
}
public
void
setRole
(
RoleDTO
role
)
{
this
.
role
=
role
;
}
public
List
<
MenuRightInfoDTO
>
getMenuRightList
()
{
return
menuRightList
;
}
public
void
setMenuRightList
(
List
<
MenuRightInfoDTO
>
menuRightList
)
{
this
.
menuRightList
=
menuRightList
;
}
}
\ No newline at end of file
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/response/WebLoginResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.manage.api.dto.EnterpriseDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/28.
*
* @author hua
*/
public
class
WebLoginResponse
implements
Serializable
{
private
String
userId
;
private
List
<
EnterpriseDTO
>
enterpriseList
;
public
String
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
}
public
List
<
EnterpriseDTO
>
getEnterpriseList
()
{
return
enterpriseList
;
}
public
void
setEnterpriseList
(
List
<
EnterpriseDTO
>
enterpriseList
)
{
this
.
enterpriseList
=
enterpriseList
;
}
}
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
View file @
207cf344
...
...
@@ -96,6 +96,4 @@
retries=
"0"
check=
"false"
/>
</beans>
haoban-manage3-wx/pom.xml
View file @
207cf344
...
...
@@ -14,10 +14,6 @@
<version>
${libraryVersion}
</version>
<packaging>
war
</packaging>
<name>
haoban-manage3-wx Maven Webapp
</name>
<!-- FIXME change it to the project's website -->
<url>
http://www.example.com
</url>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<commonVersion>
3.0-SNAPSHOT
</commonVersion>
...
...
@@ -103,24 +99,10 @@
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-contacts-api
</artifactId>
<version>
${haoban-contacts-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-manage3-api
</artifactId>
<version>
${haoban-manage3-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-contacts-manage-api
</artifactId>
<version>
${haoban-contacts-manage-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-auth-api
</artifactId>
<version>
${haoban-auth-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-operation-api
</artifactId>
...
...
@@ -149,34 +131,15 @@
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-message-api
</artifactId>
<version>
${haoban-message-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-app-announcement-api
</artifactId>
<version>
${haoban-app-announcement-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-communicate-api
</artifactId>
<version>
${haoban-communicate-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
haoban-mobile-app-api
</artifactId>
<version>
${haoban-mobile-app-api}
</version>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-thirdparty-sdk
</artifactId>
<version>
${gic-thirdparty-sdk}
</version>
</dependency>
<dependency>
<groupId>
com.gic.operation
</groupId>
<artifactId>
gic-operation-api
</artifactId>
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
View file @
207cf344
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO
;
import
com.gic.haoban.base.api.common.pojo.dto.WellDoneLoginDTO
;
import
com.gic.haoban.common.utils.AuthRequestWellDoneUtil
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
org.apache.commons.collections.CollectionUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* Created 2018/7/18.
...
...
@@ -54,24 +48,4 @@ public class WebBaseController {
return
AuthRequestWellDoneUtil
.
getLoginUser
();
}
public
boolean
haveRight
(
List
<
DisplayRelationShortInfoDTO
>
list
){
List
<
String
>
groupList
=
new
ArrayList
<
String
>();
List
<
String
>
storeList
=
new
ArrayList
<
String
>();
List
<
String
>
clerkList
=
new
ArrayList
<
String
>();
if
(
list
==
null
){
return
false
;
}
for
(
DisplayRelationShortInfoDTO
showDto
:
list
){
if
(
showDto
.
getGroupId
()!=
null
){
groupList
.
add
(
showDto
.
getGroupId
());
}
if
(
showDto
.
getStoreId
()!=
null
){
storeList
.
add
(
showDto
.
getStoreId
());
}
if
(
showDto
.
getClerkId
()!=
null
){
clerkList
.
add
(
showDto
.
getClerkId
());
}
}
return
!
CollectionUtils
.
isEmpty
(
groupList
)
||
!
CollectionUtils
.
isEmpty
(
storeList
)
||
!
CollectionUtils
.
isEmpty
(
clerkList
);
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.auth.api.dto.MenuRightDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/27.
*
* @author hua
*/
public
class
MenuDetailResponse
implements
Serializable
{
private
MenuRightDTO
top
;
private
List
<
MenuRightDTO
>
leftMenu
;
private
MenuRightDTO
current
;
public
MenuRightDTO
getTop
()
{
return
top
;
}
public
void
setTop
(
MenuRightDTO
top
)
{
this
.
top
=
top
;
}
public
List
<
MenuRightDTO
>
getLeftMenu
()
{
return
leftMenu
;
}
public
void
setLeftMenu
(
List
<
MenuRightDTO
>
leftMenu
)
{
this
.
leftMenu
=
leftMenu
;
}
public
MenuRightDTO
getCurrent
()
{
return
current
;
}
public
void
setCurrent
(
MenuRightDTO
current
)
{
this
.
current
=
current
;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java
deleted
100644 → 0
View file @
ac556257
package
com
.
gic
.
haoban
.
manage
.
web
.
response
;
import
com.gic.haoban.auth.api.dto.MenuRightInfoDTO
;
import
com.gic.haoban.auth.api.dto.RoleDTO
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Created 2018/12/17.
*
* @author hua
*/
public
class
RoleDetailResponse
implements
Serializable
{
public
RoleDTO
role
;
public
List
<
MenuRightInfoDTO
>
menuRightList
;
public
RoleDTO
getRole
()
{
return
role
;
}
public
void
setRole
(
RoleDTO
role
)
{
this
.
role
=
role
;
}
public
List
<
MenuRightInfoDTO
>
getMenuRightList
()
{
return
menuRightList
;
}
public
void
setMenuRightList
(
List
<
MenuRightInfoDTO
>
menuRightList
)
{
this
.
menuRightList
=
menuRightList
;
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment