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
72d0c2a4
Commit
72d0c2a4
authored
Jun 06, 2023
by
dengguangman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-
parent
bc0a4b65
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
65 additions
and
27 deletions
+65
-27
RegionalEconomicDataController.java
...er/search/macroMarket/RegionalEconomicDataController.java
+5
-4
SpecialBondProjectsController.java
...ler/search/macroMarket/SpecialBondProjectsController.java
+6
-3
OpRegionalEconomicDataDetailsDto.java
...com/dsk/common/dtos/OpRegionalEconomicDataDetailsDto.java
+22
-0
SpecialBondInformationDetailsDto.java
...com/dsk/common/dtos/SpecialBondInformationDetailsDto.java
+22
-0
EconomicService.java
...src/main/java/com/dsk/system/service/EconomicService.java
+2
-5
SpecialPurposeBondsService.java
...va/com/dsk/system/service/SpecialPurposeBondsService.java
+2
-1
EconomicServiceImpl.java
...java/com/dsk/system/service/impl/EconomicServiceImpl.java
+3
-9
SpecialPurposeBondsServiceImpl.java
...k/system/service/impl/SpecialPurposeBondsServiceImpl.java
+3
-5
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java
View file @
72d0c2a4
package
com
.
dsk
.
web
.
controller
.
search
.
macroMarket
;
package
com
.
dsk
.
web
.
controller
.
search
.
macroMarket
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.OpRegionalEconomicDataDetailsDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto
;
...
@@ -44,7 +45,7 @@ public class RegionalEconomicDataController {
...
@@ -44,7 +45,7 @@ public class RegionalEconomicDataController {
*@Author: Dgm
*@Author: Dgm
*@date: 2023/5/18 10:29
*@date: 2023/5/18 10:29
*/
*/
@
Ge
tMapping
(
"/years/list"
)
@
Pos
tMapping
(
"/years/list"
)
public
AjaxResult
yearsList
()
{
public
AjaxResult
yearsList
()
{
return
economicService
.
yearsList
();
return
economicService
.
yearsList
();
}
}
...
@@ -57,9 +58,9 @@ public class RegionalEconomicDataController {
...
@@ -57,9 +58,9 @@ public class RegionalEconomicDataController {
*@Author: Dgm
*@Author: Dgm
*@date: 2023/5/18 10:29
*@date: 2023/5/18 10:29
*/
*/
@
GetMapping
(
"/details/{id}
"
)
@
PostMapping
(
"/details
"
)
public
AjaxResult
details
(
@
PathVariable
(
"id"
)
Integer
id
)
{
public
AjaxResult
details
(
@
RequestBody
@Valid
OpRegionalEconomicDataDetailsDto
detailsDto
)
{
return
economicService
.
details
(
id
);
return
economicService
.
details
(
detailsDto
);
}
}
...
...
dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/SpecialBondProjectsController.java
View file @
72d0c2a4
package
com
.
dsk
.
web
.
controller
.
search
.
macroMarket
;
package
com
.
dsk
.
web
.
controller
.
search
.
macroMarket
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.SpecialBondInformationDetailsDto
;
import
com.dsk.common.dtos.SpecialBondInformationPageDto
;
import
com.dsk.common.dtos.SpecialBondInformationPageDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsPageDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsPageDto
;
...
@@ -8,6 +9,8 @@ import com.dsk.system.service.SpecialPurposeBondsService;
...
@@ -8,6 +9,8 @@ import com.dsk.system.service.SpecialPurposeBondsService;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.Valid
;
/**
/**
* @ClassName SpecialBondProjectsController
* @ClassName SpecialBondProjectsController
* @Description 专项债项目
* @Description 专项债项目
...
@@ -42,9 +45,9 @@ public class SpecialBondProjectsController {
...
@@ -42,9 +45,9 @@ public class SpecialBondProjectsController {
*@Author: Dgm
*@Author: Dgm
*@date: 2023/5/18 10:29
*@date: 2023/5/18 10:29
*/
*/
@
GetMapping
(
"/details/{id}
"
)
@
PostMapping
(
"/details
"
)
public
AjaxResult
details
(
@
PathVariable
(
"id"
)
String
id
)
{
public
AjaxResult
details
(
@
RequestBody
@Valid
SpecialBondInformationDetailsDto
detailsDto
)
{
return
specialPurposeBondsService
.
details
(
id
);
return
specialPurposeBondsService
.
details
(
detailsDto
);
}
}
...
...
dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataDetailsDto.java
0 → 100644
View file @
72d0c2a4
package
com
.
dsk
.
common
.
dtos
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
/**
* @ClassName OpRegionalEconomicDataV1Dto
* @Description 区域经济大全-详情
* @Author Dgm
* @Date 2023/5/23 14:05
* @Version
*/
@Data
public
class
OpRegionalEconomicDataDetailsDto
{
/**
* id
*/
@NotNull
(
message
=
"id 不能为空"
)
private
Integer
id
;
}
dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondInformationDetailsDto.java
0 → 100644
View file @
72d0c2a4
package
com
.
dsk
.
common
.
dtos
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
/**
* @ClassName SpecialBondInformationDetailsDto
* @Description 专项债-详情
* @Author Dgm
* @Date 2023/5/23 14:05
* @Version
*/
@Data
public
class
SpecialBondInformationDetailsDto
{
/**
* 专项债券唯一标识
*/
@NotNull
(
message
=
"id 不能为空"
)
private
Integer
id
;
}
dsk-system/src/main/java/com/dsk/system/service/EconomicService.java
View file @
72d0c2a4
package
com
.
dsk
.
system
.
service
;
package
com
.
dsk
.
system
.
service
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto
;
import
com.dsk.common.dtos.*
;
import
com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataV1Dto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto
;
/**
/**
* @ClassName EconomicService
* @ClassName EconomicService
...
@@ -42,7 +39,7 @@ public interface EconomicService {
...
@@ -42,7 +39,7 @@ public interface EconomicService {
*@Author: Dgm
*@Author: Dgm
*@date: 2023/5/18 10:25
*@date: 2023/5/18 10:25
*/
*/
AjaxResult
details
(
Integer
id
);
AjaxResult
details
(
OpRegionalEconomicDataDetailsDto
detailsDto
);
/***
/***
...
...
dsk-system/src/main/java/com/dsk/system/service/SpecialPurposeBondsService.java
View file @
72d0c2a4
package
com
.
dsk
.
system
.
service
;
package
com
.
dsk
.
system
.
service
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.SpecialBondInformationDetailsDto
;
import
com.dsk.common.dtos.SpecialBondInformationPageDto
;
import
com.dsk.common.dtos.SpecialBondInformationPageDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsPageDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsPageDto
;
...
@@ -30,7 +31,7 @@ public interface SpecialPurposeBondsService {
...
@@ -30,7 +31,7 @@ public interface SpecialPurposeBondsService {
*@Author: Dgm
*@Author: Dgm
*@date: 2023/5/18 10:25
*@date: 2023/5/18 10:25
*/
*/
AjaxResult
details
(
S
tring
id
);
AjaxResult
details
(
S
pecialBondInformationDetailsDto
detailsDto
);
/***
/***
*@Description: 项目类别统计
*@Description: 项目类别统计
...
...
dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java
View file @
72d0c2a4
...
@@ -3,17 +3,13 @@ package com.dsk.system.service.impl;
...
@@ -3,17 +3,13 @@ package com.dsk.system.service.impl;
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.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto
;
import
com.dsk.common.dtos.*
;
import
com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataV1Dto
;
import
com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto
;
import
com.dsk.common.utils.DateUtils
;
import
com.dsk.common.utils.DateUtils
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
com.dsk.system.service.EconomicService
;
import
com.dsk.system.service.EconomicService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -45,10 +41,8 @@ public class EconomicServiceImpl implements EconomicService {
...
@@ -45,10 +41,8 @@ public class EconomicServiceImpl implements EconomicService {
}
}
@Override
@Override
public
AjaxResult
details
(
Integer
id
)
{
public
AjaxResult
details
(
OpRegionalEconomicDataDetailsDto
detailsDto
)
{
Map
<
String
,
Object
>
bodyMap
=
new
HashMap
<>(
1
);
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/economic/details"
,
BeanUtil
.
beanToMap
(
detailsDto
,
false
,
false
));
bodyMap
.
put
(
"id"
,
id
);
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/economic/details"
,
bodyMap
);
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
}
}
...
...
dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java
View file @
72d0c2a4
...
@@ -2,6 +2,7 @@ package com.dsk.system.service.impl;
...
@@ -2,6 +2,7 @@ package com.dsk.system.service.impl;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.SpecialBondInformationDetailsDto
;
import
com.dsk.common.dtos.SpecialBondInformationPageDto
;
import
com.dsk.common.dtos.SpecialBondInformationPageDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsPageDto
;
import
com.dsk.common.dtos.SpecialPurposeBondsPageDto
;
...
@@ -10,7 +11,6 @@ import com.dsk.system.service.SpecialPurposeBondsService;
...
@@ -10,7 +11,6 @@ import com.dsk.system.service.SpecialPurposeBondsService;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -33,10 +33,8 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
...
@@ -33,10 +33,8 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
}
}
@Override
@Override
public
AjaxResult
details
(
String
id
)
{
public
AjaxResult
details
(
SpecialBondInformationDetailsDto
detailsDto
)
{
Map
<
String
,
Object
>
bodyMap
=
new
HashMap
<>(
1
);
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/specialPurposeBonds/details"
,
BeanUtil
.
beanToMap
(
detailsDto
,
false
,
false
));
bodyMap
.
put
(
"id"
,
id
);
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/specialPurposeBonds/details"
,
bodyMap
);
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
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