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
c8028cb8
Commit
c8028cb8
authored
Aug 20, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/developer' into developer
parents
2529e89c
2e51d108
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
7 deletions
+9
-7
TabIndexDescMapper.java
...ain/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java
+2
-1
IndexDescService.java
...src/main/java/com/gic/cloud/service/IndexDescService.java
+1
-1
IndexDescServiceImpl.java
...java/com/gic/cloud/service/impl/IndexDescServiceImpl.java
+2
-2
IndexDescApiServiceImpl.java
...gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java
+1
-1
TabIndexDescMapper.xml
...-service/src/main/resources/mapper/TabIndexDescMapper.xml
+2
-1
LoginController.java
...in/java/com/gic/cloud/web/controller/LoginController.java
+1
-1
No files found.
gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java
View file @
c8028cb8
...
...
@@ -67,5 +67,5 @@ public interface TabIndexDescMapper {
List
<
TabIndexDesc
>
listByIds
(
@Param
(
"ids"
)
List
<
Integer
>
indexDescIdList
);
TabIndexDesc
getIndexDescByIndexCode
(
@Param
(
"moduleId"
)
String
moduleId
,
@Param
(
"indexCode"
)
String
indexCode
);
TabIndexDesc
getIndexDescByIndexCode
(
@Param
(
"moduleId"
)
String
moduleId
,
@Param
(
"indexCode"
)
String
indexCode
,
@Param
(
"indexGroupName"
)
String
indexGroupName
);
}
\ No newline at end of file
gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescService.java
View file @
c8028cb8
...
...
@@ -27,7 +27,7 @@ public interface IndexDescService {
List
<
TabIndexDesc
>
listByIds
(
List
<
Integer
>
indexDescIdList
);
TabIndexDesc
getIndexDesc
(
String
moduleId
,
String
indexCode
);
TabIndexDesc
getIndexDesc
(
String
moduleId
,
String
indexCode
,
String
indexGroupName
);
void
init
(
Integer
enterpriseId
);
}
gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java
View file @
c8028cb8
...
...
@@ -64,8 +64,8 @@ public class IndexDescServiceImpl implements IndexDescService {
}
@Override
public
TabIndexDesc
getIndexDesc
(
String
moduleId
,
String
indexCode
)
{
return
tabIndexDescMapper
.
getIndexDescByIndexCode
(
moduleId
,
indexCode
);
public
TabIndexDesc
getIndexDesc
(
String
moduleId
,
String
indexCode
,
String
indexGroupName
)
{
return
tabIndexDescMapper
.
getIndexDescByIndexCode
(
moduleId
,
indexCode
,
indexGroupName
);
}
@Override
...
...
gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java
View file @
c8028cb8
...
...
@@ -73,7 +73,7 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
@Override
public
ServiceResponse
<
IndexDTO
>
getIndexDesc
(
Integer
enterpriseId
,
String
moduleId
,
String
indexGroupName
,
String
indexCode
)
{
// TabIndex index = indexService.getByIndexCode(moduleId, indexCode);
TabIndexDesc
indexDesc
=
indexDescService
.
getIndexDesc
(
moduleId
,
indexCode
);
TabIndexDesc
indexDesc
=
indexDescService
.
getIndexDesc
(
moduleId
,
indexCode
,
indexGroupName
);
List
<
Integer
>
list
=
indexModuleRelService
.
listBusinessIdByModuleId
(
indexDesc
.
getIndexDescId
().
toString
(),
LogAndUpdateTipsTypeEnum
.
INDEX
.
getCode
());
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
Integer
indexId
=
list
.
get
(
0
);
...
...
gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml
View file @
c8028cb8
...
...
@@ -234,6 +234,6 @@
<select
id=
"getIndexDescByIndexCode"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
and index_group_name = #{indexGroupName} limit 1
</select>
</mapper>
\ No newline at end of file
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/LoginController.java
View file @
c8028cb8
...
...
@@ -49,7 +49,7 @@ public class LoginController {
List
<
Integer
>
enterpriseIdList
=
userDTOList
.
stream
().
map
(
userDTO
->
userDTO
.
getEnterpriseId
()).
collect
(
Collectors
.
toList
());
List
<
EnterpriseDTO
>
enterpriseDTOList
=
this
.
enterpriseApiService
.
listEnterpriseByIds
(
enterpriseIdList
).
getResult
();
Integer
enterpriseId
=
userDTOList
.
get
(
0
).
getEnterpriseId
();
String
code
=
CreateRandomUtils
.
ge
tStringRandom
(
4
);
String
code
=
CreateRandomUtils
.
ge
nerateNumberStr
(
4
);
ServiceResponse
<
Void
>
smsSendResult
=
smsSendApiService
.
sendPlatformSms
(
smsSenceId
,
enterpriseId
,
areaCode
,
phoneNumber
,
new
String
[]{
code
});
if
(
smsSendResult
.
isSuccess
()){
String
key
=
"GYTCode:"
+
areaCode
+
":"
+
phoneNumber
;
...
...
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