Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
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
Administrator
dsk-cr20g
Commits
79dbad94
Commit
79dbad94
authored
Jun 27, 2023
by
dengguangman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-
parent
bd22eb47
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
11 deletions
+71
-11
RegionalEnterprisesController.java
...ler/search/macroMarket/RegionalEnterprisesController.java
+13
-3
RegionalEnterprisesService.java
...va/com/dsk/system/service/RegionalEnterprisesService.java
+3
-3
RegionalEnterprisesServiceImpl.java
...k/system/service/impl/RegionalEnterprisesServiceImpl.java
+55
-5
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEnterprisesController.java
View file @
79dbad94
package
com
.
dsk
.
web
.
controller
.
search
.
macroMarket
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.ComposeQueryDto
;
import
com.dsk.system.service.RegionalEnterprisesService
;
import
com.dsk.web.controller.search.controller.PageQueryLimit
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
...
@@ -24,7 +26,15 @@ public class RegionalEnterprisesController {
private
RegionalEnterprisesService
regionalEnterprisesService
;
@PostMapping
(
"regional/page"
)
public
TableDataInfo
page
(
@RequestBody
ComposeQueryDto
compose
)
throws
Exception
{
return
regionalEnterprisesService
.
page
(
compose
);
public
AjaxResult
page
(
@RequestBody
JSONObject
object
)
throws
Exception
{
ComposeQueryDto
compose
=
JSONObject
.
parseObject
(
object
.
toJSONString
(),
ComposeQueryDto
.
class
);
compose
.
getPage
().
setPage
(
compose
.
getPageNum
());
compose
.
getPage
().
setLimit
(
compose
.
getPageSize
());
compose
.
getPage
().
setField
(
compose
.
getField
());
compose
.
getPage
().
setOrder
(
compose
.
getOrder
());
if
(
PageQueryLimit
.
pageLimit
(
compose
.
getPage
())){
return
AjaxResult
.
error
(
"翻页已达到上限"
);
}
return
regionalEnterprisesService
.
enterprisePage
(
object
);
}
}
dsk-system/src/main/java/com/dsk/system/service/RegionalEnterprisesService.java
View file @
79dbad94
package
com
.
dsk
.
system
.
service
;
import
com.
dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.
dtos.ComposeQueryDto
;
import
com.
alibaba.fastjson2.JSONObject
;
import
com.dsk.common.
core.domain.AjaxResult
;
/**
* @ClassName EconomicService
...
...
@@ -19,5 +19,5 @@ public interface RegionalEnterprisesService {
*@Author: Dgm
*@date: 2023/5/18 10:25
*/
TableDataInfo
page
(
ComposeQueryDto
compose
)
throws
Exception
;
AjaxResult
enterprisePage
(
JSONObject
compose
)
throws
Exception
;
}
dsk-system/src/main/java/com/dsk/system/service/impl/RegionalEnterprisesServiceImpl.java
View file @
79dbad94
package
com
.
dsk
.
system
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.dtos.ComposeQueryDto
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.dsk.acc.openapi.client.util.CommonUtils
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.model.EnterpriseInfoHeaderBody
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
com.dsk.system.service.RegionalEnterprisesService
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.MapUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -24,8 +31,51 @@ public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesServic
private
DskOpenApiUtil
dskOpenApiUtil
;
@Override
public
TableDataInfo
page
(
ComposeQueryDto
compose
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/nationzj/enterprice/page"
,
BeanUtil
.
beanToMap
(
compose
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
public
AjaxResult
enterprisePage
(
JSONObject
object
)
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/nationzj/enterprice/page"
,
object
);
Integer
code
=
MapUtils
.
getInteger
(
map
,
"code"
,
300
);
if
(
code
.
equals
(
HttpStatus
.
OK
.
value
()))
{
Map
data
=
MapUtils
.
getMap
(
map
,
"data"
,
null
);
List
<
Object
>
list
=
CommonUtils
.
assertAsArray
(
MapUtils
.
getObject
(
data
,
"list"
,
""
));
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
for
(
Object
companyObj
:
list
)
{
Map
<
String
,
Object
>
companyMap
=
CommonUtils
.
assertAsMap
(
companyObj
);
//常合作客户id
Integer
topCustomerId
=
MapUtils
.
getInteger
(
companyMap
,
"topCustomerId"
);
EnterpriseInfoHeaderBody
body
=
new
EnterpriseInfoHeaderBody
();
body
.
setCompanyId
(
topCustomerId
);
if
(
ObjectUtil
.
isNotEmpty
(
topCustomerId
))
{
Map
<
String
,
Object
>
infoHeaderMap
=
dskOpenApiUtil
.
requestBody
(
"/api/jsk/enterprise/infoHeader"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Integer
infoHeaderCode
=
MapUtils
.
getInteger
(
infoHeaderMap
,
"code"
,
300
);
if
(
infoHeaderCode
.
equals
(
HttpStatus
.
OK
.
value
()))
{
Map
infoHeaderData
=
MapUtils
.
getMap
(
infoHeaderMap
,
"data"
,
null
);
String
companyName
=
MapUtils
.
getString
(
infoHeaderData
,
"companyName"
,
null
);
companyMap
.
put
(
"topCustomer"
,
companyName
);
}
else
{
companyMap
.
put
(
"topCustomer"
,
null
);
}
}
else
{
companyMap
.
put
(
"topCustomer"
,
null
);
}
//常合作供应商id
Integer
topSupplierId
=
MapUtils
.
getInteger
(
companyMap
,
"topSupplierId"
);
body
.
setCompanyId
(
topSupplierId
);
if
(
ObjectUtil
.
isNotEmpty
(
topSupplierId
))
{
Map
<
String
,
Object
>
infoHeaderMap
=
dskOpenApiUtil
.
requestBody
(
"/api/jsk/enterprise/infoHeader"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
Integer
infoHeaderCode
=
MapUtils
.
getInteger
(
infoHeaderMap
,
"code"
,
300
);
if
(
infoHeaderCode
.
equals
(
HttpStatus
.
OK
.
value
()))
{
Map
infoHeaderData
=
MapUtils
.
getMap
(
infoHeaderMap
,
"data"
,
null
);
String
companyName
=
MapUtils
.
getString
(
infoHeaderData
,
"companyName"
,
null
);
companyMap
.
put
(
"topSupplier"
,
companyName
);
}
else
{
companyMap
.
put
(
"topSupplier"
,
null
);
}
}
else
{
companyMap
.
put
(
"topSupplier"
,
null
);
}
}
}
}
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
}
}
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