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
f02d9b80
Commit
f02d9b80
authored
Aug 16, 2023
by
danfuman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev20230707' of
http://192.168.60.201/root/dsk-operate-sys
into dev20230707
parents
e27cff45
60ede402
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
213 additions
and
0 deletions
+213
-0
EnterpriseBussinessController.java
...dsk/web/controller/dsk/EnterpriseBussinessController.java
+5
-0
IndexController.java
...main/java/com/dsk/web/controller/dsk/IndexController.java
+66
-0
JskCombineInfoController.java
.../com/dsk/web/controller/dsk/JskCombineInfoController.java
+34
-0
EnterpriseBussinessService.java
...com/dsk/system/dskService/EnterpriseBussinessService.java
+32
-0
IndexService.java
...src/main/java/com/dsk/system/dskService/IndexService.java
+54
-0
JskCombineInfoService.java
...java/com/dsk/system/dskService/JskCombineInfoService.java
+22
-0
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java
View file @
f02d9b80
...
@@ -121,5 +121,10 @@ public class EnterpriseBussinessController {
...
@@ -121,5 +121,10 @@ public class EnterpriseBussinessController {
return
enterpriseBussinessService
.
awardDetail
(
paramMap
);
return
enterpriseBussinessService
.
awardDetail
(
paramMap
);
}
}
@ApiOperation
(
value
=
"荣誉奖项详情"
)
@RequestMapping
(
value
=
"/select"
,
method
=
RequestMethod
.
POST
)
public
R
select
(
@RequestBody
EnterpriseBusinessAwardDetailBody
paramMap
)
throws
Exception
{
return
enterpriseBussinessService
.
select
(
paramMap
);
}
}
}
dsk-admin/src/main/java/com/dsk/web/controller/dsk/IndexController.java
0 → 100644
View file @
f02d9b80
package
com
.
dsk
.
web
.
controller
.
dsk
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.domain.model.*
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.system.dskService.IndexService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.Valid
;
import
java.util.Map
;
/**
* @ClassName IndexController
* @Description TODO
* @Author Dgm
* @Date 2023/8/15 12:01
* @Version 1.0
*/
@Api
(
"首页数据相关"
)
@RestController
@RequestMapping
(
"/index"
)
public
class
IndexController
{
@Autowired
private
IndexService
enterpriseService
;
@ApiOperation
(
value
=
"企业中标排行榜"
)
@PostMapping
(
"/winningBidsRanking"
)
public
R
winningBidsRanking
(
@RequestBody
Map
<
String
,
Object
>
paramMap
)
throws
Exception
{
return
enterpriseService
.
winningBidsRanking
(
paramMap
);
}
@ApiOperation
(
value
=
"企业中标排行-项目类型"
)
@PostMapping
(
"/rankingProjectType"
)
public
R
rankingProjectType
(
@RequestBody
Map
<
String
,
Object
>
paramMap
)
throws
Exception
{
return
enterpriseService
.
rankingProjectType
(
paramMap
);
}
@ApiOperation
(
value
=
"大项目最新中标"
)
@PostMapping
(
value
=
"bigWinningBidsPage"
)
public
TableDataInfo
bigWinningBidsPage
(
@RequestBody
@Valid
EnterprisePartnersBody
vo
)
throws
Exception
{
return
enterpriseService
.
bigWinningBidsPage
(
vo
);
}
@ApiOperation
(
value
=
"大项目最新招标"
)
@PostMapping
(
value
=
"bigBidPage"
)
public
TableDataInfo
bigBidPage
(
@RequestBody
@Valid
EnterprisePartnersBody
vo
)
throws
Exception
{
return
enterpriseService
.
bigBidPage
(
vo
);
}
@ApiOperation
(
value
=
"企业中标排行-项目类型"
)
@PostMapping
(
"/bigBidProjectType"
)
public
R
bigBidProjectType
(
@RequestBody
Map
<
String
,
Object
>
paramMap
)
throws
Exception
{
return
enterpriseService
.
bigBidProjectType
(
paramMap
);
}
}
dsk-admin/src/main/java/com/dsk/web/controller/dsk/JskCombineInfoController.java
View file @
f02d9b80
package
com
.
dsk
.
web
.
controller
.
dsk
;
package
com
.
dsk
.
web
.
controller
.
dsk
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.dsk.common.core.controller.BaseController
;
import
com.dsk.common.core.controller.BaseController
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.system.domain.dsk.dto.JskCombineCertificateDto
;
import
com.dsk.system.domain.dsk.dto.JskCombineCertificateDto
;
...
@@ -72,4 +74,36 @@ public class JskCombineInfoController extends BaseController {
...
@@ -72,4 +74,36 @@ public class JskCombineInfoController extends BaseController {
public
R
groupCertificateCount
(
@RequestBody
JskCombineSearchDto
dto
)
throws
Exception
{
public
R
groupCertificateCount
(
@RequestBody
JskCombineSearchDto
dto
)
throws
Exception
{
return
baseService
.
groupCertificateCount
(
dto
);
return
baseService
.
groupCertificateCount
(
dto
);
}
}
/**
* 集团户搜索
*/
@PostMapping
(
"/index"
)
public
AjaxResult
index
(
@RequestBody
JSONObject
object
)
{
return
baseService
.
index
(
object
);
}
/**
* 查央企
*/
@PostMapping
(
"/centralEnterprse"
)
public
AjaxResult
centralEnterprse
()
{
return
baseService
.
centralEnterprse
();
}
/**
* 查央企子公司
*/
@PostMapping
(
"/centralEnterprse/child"
)
public
AjaxResult
centralEnterprseChild
()
{
return
baseService
.
centralEnterprseChild
();
}
/**
* 查地方国企
*/
@PostMapping
(
"/centralEnterprse/local"
)
public
AjaxResult
centralEnterprseLocal
(
@RequestBody
JSONObject
object
)
{
return
baseService
.
centralEnterprseLocal
(
object
);
}
}
}
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @
f02d9b80
...
@@ -81,6 +81,7 @@ public class EnterpriseBussinessService {
...
@@ -81,6 +81,7 @@ public class EnterpriseBussinessService {
Map
<
String
,
Object
>
dataMap
=
CommonUtils
.
assertAsMap
(
supplierProject
);
Map
<
String
,
Object
>
dataMap
=
CommonUtils
.
assertAsMap
(
supplierProject
);
dataMap
.
put
(
"sourceId"
,
null
);
dataMap
.
put
(
"sourceId"
,
null
);
dataMap
.
put
(
"sourceType"
,
null
);
dataMap
.
put
(
"sourceType"
,
null
);
dataMap
.
put
(
"sourceList"
,
null
);
String
source
=
MapUtils
.
getString
(
dataMap
,
"source"
);
String
source
=
MapUtils
.
getString
(
dataMap
,
"source"
);
if
(
ObjectUtil
.
isNotEmpty
(
source
))
{
if
(
ObjectUtil
.
isNotEmpty
(
source
))
{
List
<
EnterpriseBussinessVo
>
enterpriseBussinessVoList
=
JSONUtil
.
toList
(
source
,
EnterpriseBussinessVo
.
class
);
List
<
EnterpriseBussinessVo
>
enterpriseBussinessVoList
=
JSONUtil
.
toList
(
source
,
EnterpriseBussinessVo
.
class
);
...
@@ -88,6 +89,7 @@ public class EnterpriseBussinessService {
...
@@ -88,6 +89,7 @@ public class EnterpriseBussinessService {
EnterpriseBussinessVo
vo
=
enterpriseBussinessVoList
.
get
(
0
);
EnterpriseBussinessVo
vo
=
enterpriseBussinessVoList
.
get
(
0
);
dataMap
.
put
(
"sourceId"
,
vo
.
getSource_id
());
dataMap
.
put
(
"sourceId"
,
vo
.
getSource_id
());
dataMap
.
put
(
"sourceType"
,
vo
.
getSource_type
());
dataMap
.
put
(
"sourceType"
,
vo
.
getSource_type
());
dataMap
.
put
(
"sourceList"
,
enterpriseBussinessVoList
);
}
}
}
}
}
}
...
@@ -176,6 +178,7 @@ public class EnterpriseBussinessService {
...
@@ -176,6 +178,7 @@ public class EnterpriseBussinessService {
EnterpriseBussinessVo
vo
=
enterpriseBussinessVoList
.
get
(
0
);
EnterpriseBussinessVo
vo
=
enterpriseBussinessVoList
.
get
(
0
);
dataMap
.
put
(
"sourceId"
,
vo
.
getSource_id
());
dataMap
.
put
(
"sourceId"
,
vo
.
getSource_id
());
dataMap
.
put
(
"sourceType"
,
vo
.
getSource_type
());
dataMap
.
put
(
"sourceType"
,
vo
.
getSource_type
());
dataMap
.
put
(
"sourceList"
,
enterpriseBussinessVoList
);
}
}
}
}
}
}
...
@@ -245,4 +248,33 @@ public class EnterpriseBussinessService {
...
@@ -245,4 +248,33 @@ public class EnterpriseBussinessService {
}
}
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
}
public
R
select
(
EnterpriseBusinessAwardDetailBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
List
<
String
>
sourcesList
=
new
ArrayList
<>(
5
);
sourcesList
.
add
(
"中标公示"
);
sourcesList
.
add
(
"四库业绩"
);
sourcesList
.
add
(
"中标业绩"
);
sourcesList
.
add
(
"水利业绩"
);
sourcesList
.
add
(
"荣誉奖项"
);
map
.
put
(
"sources"
,
sourcesList
);
List
<
String
>
projectsList
=
new
ArrayList
<>(
2
);
projectsList
.
add
(
"矿山工程"
);
projectsList
.
add
(
"铁路工程"
);
projectsList
.
add
(
"港口与航道工程"
);
projectsList
.
add
(
"冶金工程"
);
projectsList
.
add
(
"水利工程"
);
projectsList
.
add
(
"机电工程"
);
projectsList
.
add
(
"市政工程"
);
projectsList
.
add
(
"石油化工工程"
);
projectsList
.
add
(
"电力工程"
);
projectsList
.
add
(
"通信工程"
);
projectsList
.
add
(
"公路工程"
);
projectsList
.
add
(
"房建工程"
);
projectsList
.
add
(
"其他"
);
map
.
put
(
"projects"
,
projectsList
);
return
R
.
ok
(
map
);
}
}
}
dsk-system/src/main/java/com/dsk/system/dskService/IndexService.java
0 → 100644
View file @
f02d9b80
package
com
.
dsk
.
system
.
dskService
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.domain.model.*
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.*
;
/**
* @ClassName enterpriseService
* @Description TODO
* @Author Dgm
* @Date 2023/5/15 12:00
* @Version 1.0
*/
@Service
public
class
IndexService
{
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
IndexService
.
class
);
@Autowired
private
DskOpenApiUtil
dskOpenApiUtil
;
public
R
winningBidsRanking
(
Map
<
String
,
Object
>
paramMap
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/winningBidsRanking"
,
paramMap
);
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
public
R
rankingProjectType
(
Map
<
String
,
Object
>
paramMap
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/rankingProjectType"
,
paramMap
);
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
public
TableDataInfo
bigWinningBidsPage
(
EnterprisePartnersBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/bigWinningBidsPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
bigBidPage
(
EnterprisePartnersBody
body
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/bigBidPage"
,
BeanUtil
.
beanToMap
(
body
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
R
bigBidProjectType
(
Map
<
String
,
Object
>
paramMap
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/enterpriseProject/bigBidProjectType"
,
paramMap
);
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
}
dsk-system/src/main/java/com/dsk/system/dskService/JskCombineInfoService.java
View file @
f02d9b80
...
@@ -3,6 +3,8 @@ package com.dsk.system.dskService;
...
@@ -3,6 +3,8 @@ package com.dsk.system.dskService;
import
cn.hutool.core.bean.BeanException
;
import
cn.hutool.core.bean.BeanException
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.domain.R
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
com.dsk.common.utils.DskOpenApiUtil
;
...
@@ -88,4 +90,24 @@ public class JskCombineInfoService {
...
@@ -88,4 +90,24 @@ public class JskCombineInfoService {
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/combine/group/certificateCount"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/combine/group/certificateCount"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
return
BeanUtil
.
toBean
(
map
,
R
.
class
);
}
}
public
AjaxResult
index
(
JSONObject
object
)
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/nationzj/enterprice/groupCompany"
,
object
);
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
}
public
AjaxResult
centralEnterprse
()
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/nationzj/enterprice/centralEnterprse"
,
null
);
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
}
public
AjaxResult
centralEnterprseChild
()
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/nationzj/enterprice/centralEnterprse/child"
,
null
);
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
}
public
AjaxResult
centralEnterprseLocal
(
JSONObject
object
)
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/nationzj/enterprice/centralEnterprse/local"
,
object
);
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