Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
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
base_platform_enterprise
gic-data-cloud
Commits
837c6158
Commit
837c6158
authored
Sep 07, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pmd规范
parent
811522ec
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
197 additions
and
25 deletions
+197
-25
DataAuthController.java
...java/com/gic/cloud/web/controller/DataAuthController.java
+7
-1
FunctionController.java
...java/com/gic/cloud/web/controller/FunctionController.java
+7
-1
TempStoreConditionController.java
...ic/cloud/web/controller/TempStoreConditionController.java
+9
-2
TestController.java
...ain/java/com/gic/cloud/web/controller/TestController.java
+6
-1
UserController.java
...ain/java/com/gic/cloud/web/controller/UserController.java
+12
-6
TestQo.java
...-cloud-web/src/main/java/com/gic/cloud/web/qo/TestQo.java
+6
-1
AccountGroupVO.java
...eb/src/main/java/com/gic/cloud/web/vo/AccountGroupVO.java
+12
-1
DataAuthDetailVO.java
.../src/main/java/com/gic/cloud/web/vo/DataAuthDetailVO.java
+12
-1
DataAuthListVO.java
...eb/src/main/java/com/gic/cloud/web/vo/DataAuthListVO.java
+12
-1
DataAuthVO.java
...ud-web/src/main/java/com/gic/cloud/web/vo/DataAuthVO.java
+12
-1
FunctionDetailVO.java
.../src/main/java/com/gic/cloud/web/vo/FunctionDetailVO.java
+12
-1
FunctionListVO.java
...eb/src/main/java/com/gic/cloud/web/vo/FunctionListVO.java
+12
-1
FunctionModuleVO.java
.../src/main/java/com/gic/cloud/web/vo/FunctionModuleVO.java
+12
-1
FunctionVO.java
...ud-web/src/main/java/com/gic/cloud/web/vo/FunctionVO.java
+12
-1
MemberCardVO.java
...-web/src/main/java/com/gic/cloud/web/vo/MemberCardVO.java
+12
-1
TempStoreConditionDetailVO.java
...java/com/gic/cloud/web/vo/TempStoreConditionDetailVO.java
+12
-1
TestVo.java
...-cloud-web/src/main/java/com/gic/cloud/web/vo/TestVo.java
+6
-1
UserDetailVO.java
...-web/src/main/java/com/gic/cloud/web/vo/UserDetailVO.java
+12
-1
UserVO.java
...-cloud-web/src/main/java/com/gic/cloud/web/vo/UserVO.java
+12
-1
No files found.
gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/DataAuthController.java
View file @
837c6158
...
...
@@ -13,7 +13,13 @@ import com.gic.cloud.service.DataAuthApiService;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
/**
* 数据权限
* @ClassName: DataAuthController
* @Description:
* @author guojuxing
* @date 2020/9/7 10:59 AM
*/
@RestController
@RequestMapping
(
"/data-auth"
)
public
class
DataAuthController
{
...
...
gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/FunctionController.java
View file @
837c6158
...
...
@@ -13,7 +13,13 @@ import com.gic.cloud.web.vo.FunctionVO;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
/**
* 功能
* @ClassName: FunctionController
* @Description:
* @author guojuxing
* @date 2020/9/7 10:58 AM
*/
@RestController
@RequestMapping
(
"/function"
)
public
class
FunctionController
{
...
...
gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/TempStoreConditionController.java
View file @
837c6158
...
...
@@ -20,7 +20,13 @@ import com.gic.store.dto.StoreSearchDTO;
import
com.gic.store.dto.StoreWidgetDTO
;
import
com.gic.store.service.StoreApiService
;
import
com.gic.store.service.StoreWidgetApiService
;
/**
* 门店暂存区
* @ClassName: TempStoreConditionController
* @Description:
* @author guojuxing
* @date 2020/9/7 10:59 AM
*/
@RestController
@RequestMapping
(
"temp-store"
)
public
class
TempStoreConditionController
{
...
...
@@ -65,7 +71,8 @@ public class TempStoreConditionController {
if
(
storeWidgetDTO
!=
null
)
{
String
authSearchParam
=
storeWidgetDTO
.
getAuthSearchParam
();
String
searchParam
=
storeWidgetDTO
.
getSearchParam
();
if
(
StringUtils
.
isNotBlank
(
authSearchParam
)
&&
!
"{}"
.
equals
(
authSearchParam
))
{
String
authSearchParamSign
=
"{}"
;
if
(
StringUtils
.
isNotBlank
(
authSearchParam
)
&&
!
authSearchParamSign
.
equals
(
authSearchParam
))
{
storeSearchDTO
.
setAuthSearchJson
(
authSearchParam
);
}
storeSearchDTO
.
setSearchJson
(
searchParam
);
...
...
gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/TestController.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
controller
;
/**test
* @ClassName: TestController
* @Description:
* @author guojuxing
* @date 2020/9/7 10:58 AM
*/
public
class
TestController
{
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/UserController.java
View file @
837c6158
...
...
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.cloud.dto.AccountGroupDTO
;
import
com.gic.cloud.dto.UserDTO
;
import
com.gic.cloud.qo.UserQ
O
;
import
com.gic.cloud.qo.UserQ
o
;
import
com.gic.cloud.service.*
;
import
com.gic.cloud.web.vo.*
;
import
com.gic.commons.webapi.reponse.RestResponse
;
...
...
@@ -23,7 +23,13 @@ import com.gic.enterprise.utils.ResultControllerUtils;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.member.config.api.dto.OwnerMemberCardDTO
;
import
com.gic.member.config.api.service.MemberCardApiService
;
/**
* 用户
* @ClassName: UserController
* @Description:
* @author guojuxing
* @date 2020/9/7 10:58 AM
*/
@RestController
@RequestMapping
(
"/user"
)
public
class
UserController
{
...
...
@@ -108,16 +114,16 @@ public class UserController {
}
@RequestMapping
(
"/page-user"
)
public
RestResponse
pageUser
(
UserQ
O
userQO
)
{
userQ
O
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
return
ResultControllerUtils
.
commonPageResult
(
userApiService
.
pageUser
(
userQ
O
),
UserVO
.
class
);
public
RestResponse
pageUser
(
UserQ
o
userQo
)
{
userQ
o
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
return
ResultControllerUtils
.
commonPageResult
(
userApiService
.
pageUser
(
userQ
o
),
UserVO
.
class
);
}
@RequestMapping
(
"/bulk-transfer-user-to-new-account-group"
)
public
RestResponse
bulkTransferAccountGroup
(
String
userIds
,
Integer
targetAccountGroupId
,
boolean
isAll
)
{
List
<
Integer
>
userIdList
=
null
;
if
(
isAll
)
{
ServiceResponse
<
List
<
UserDTO
>>
result
=
userApiService
.
listUser
(
new
UserQ
O
()
ServiceResponse
<
List
<
UserDTO
>>
result
=
userApiService
.
listUser
(
new
UserQ
o
()
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
()));
if
(
result
.
isSuccess
())
{
List
<
UserDTO
>
userList
=
result
.
getResult
();
...
...
gic-data-cloud-web/src/main/java/com/gic/cloud/web/qo/TestQo.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
qo
;
/**test
* @ClassName: TestQo
* @Description:
* @author guojuxing
* @date 2020/9/7 10:58 AM
*/
public
class
TestQo
{
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/AccountGroupVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 账号分组
* @ClassName: AccountGroupVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:54 AM
*/
public
class
AccountGroupVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
2326242081989824390L
;
...
...
@@ -60,4 +66,9 @@ public class AccountGroupVO implements Serializable{
this
.
memberCount
=
memberCount
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/DataAuthDetailVO.java
View file @
837c6158
...
...
@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo;
import
org.apache.commons.lang.StringUtils
;
import
java.io.Serializable
;
/**
* 数据权限详情
* @ClassName: DataAuthDetailVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:56 AM
*/
public
class
DataAuthDetailVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
720678159449334770L
;
...
...
@@ -126,4 +132,9 @@ public class DataAuthDetailVO implements Serializable{
this
.
noOwnerStore
=
noOwnerStore
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/DataAuthListVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 数据权限
* @ClassName: DataAuthListVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:56 AM
*/
public
class
DataAuthListVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7549685019392230748L
;
...
...
@@ -32,4 +38,9 @@ public class DataAuthListVO implements Serializable{
this
.
dataAuthName
=
dataAuthName
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/DataAuthVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 数据权限
* @ClassName: DataAuthVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:56 AM
*/
public
class
DataAuthVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
6485807150571326830L
;
...
...
@@ -46,4 +52,9 @@ public class DataAuthVO implements Serializable{
this
.
memberCount
=
memberCount
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/FunctionDetailVO.java
View file @
837c6158
...
...
@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo;
import
org.apache.commons.lang.StringUtils
;
import
java.io.Serializable
;
/**
* 功能详情
* @ClassName: FunctionDetailVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:55 AM
*/
public
class
FunctionDetailVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
3211293345162922378L
;
...
...
@@ -53,4 +59,9 @@ public class FunctionDetailVO implements Serializable{
this
.
functionComponent
=
functionComponent
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/FunctionListVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 功能
* @ClassName: FunctionListVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:55 AM
*/
public
class
FunctionListVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
855201859340536651L
;
...
...
@@ -32,4 +38,9 @@ public class FunctionListVO implements Serializable{
this
.
functionName
=
functionName
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/FunctionModuleVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 功能模块
* @ClassName: FunctionModuleVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:55 AM
*/
public
class
FunctionModuleVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
9142772989283876602L
;
...
...
@@ -61,4 +67,9 @@ public class FunctionModuleVO implements Serializable{
this
.
logo
=
logo
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/FunctionVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 功能
* @ClassName: FunctionVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:56 AM
*/
public
class
FunctionVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
2470057820888440245L
;
...
...
@@ -46,4 +52,9 @@ public class FunctionVO implements Serializable{
this
.
memberCount
=
memberCount
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/MemberCardVO.java
View file @
837c6158
...
...
@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
java.io.Serializable
;
/**
* 会员卡
* @ClassName: MemberCardVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:58 AM
*/
public
class
MemberCardVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
8228087541902310573L
;
...
...
@@ -66,4 +72,9 @@ public class MemberCardVO implements Serializable{
this
.
cardName
=
cardName
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/TempStoreConditionDetailVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 门店暂存区
* @ClassName: TempStoreConditionDetailVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:57 AM
*/
public
class
TempStoreConditionDetailVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7805642144310444982L
;
...
...
@@ -32,4 +38,9 @@ public class TempStoreConditionDetailVO implements Serializable{
this
.
storeWidgetId
=
storeWidgetId
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/TestVo.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
/**test
* @ClassName: TestVo
* @Description:
* @author guojuxing
* @date 2020/9/7 10:58 AM
*/
public
class
TestVo
{
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/UserDetailVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 用户详情
* @ClassName: UserDetailVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:55 AM
*/
public
class
UserDetailVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
8143187697602019230L
;
...
...
@@ -103,4 +109,9 @@ public class UserDetailVO implements Serializable{
this
.
functionAuthId
=
functionAuthId
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/UserVO.java
View file @
837c6158
package
com
.
gic
.
cloud
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 用户
* @ClassName: UserVO
* @Description:
* @author guojuxing
* @date 2020/9/7 10:54 AM
*/
public
class
UserVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
3942964711245259430L
;
...
...
@@ -135,4 +141,9 @@ public class UserVO implements Serializable{
this
.
functionAuthName
=
functionAuthName
;
return
this
;
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
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