Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
project-manage
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
吴迪
project-manage
Commits
4fff4212
Commit
4fff4212
authored
Jul 16, 2023
by
吴迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改】投资计划、字典表相关代码
parent
453bb7ab
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
14 deletions
+53
-14
InvestmentPlanController.java
...n/modules/manage/controller/InvestmentPlanController.java
+2
-2
SysDictController.java
...wangtian/modules/manage/controller/SysDictController.java
+6
-2
SysDictItemController.java
...tian/modules/manage/controller/SysDictItemController.java
+42
-9
SysDictItemServiceImpl.java
...n/modules/manage/service/impl/SysDictItemServiceImpl.java
+3
-1
No files found.
src/main/java/com/wangtian/modules/manage/controller/InvestmentPlanController.java
View file @
4fff4212
...
@@ -33,7 +33,7 @@ public class InvestmentPlanController {
...
@@ -33,7 +33,7 @@ public class InvestmentPlanController {
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
){
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
){
PageUtils
page
=
investmentPlanService
.
queryPage
(
params
);
PageUtils
page
=
investmentPlanService
.
queryPage
(
params
);
return
R
.
ok
().
put
(
"
page
"
,
page
);
return
R
.
ok
().
put
(
"
data
"
,
page
);
}
}
...
@@ -45,7 +45,7 @@ public class InvestmentPlanController {
...
@@ -45,7 +45,7 @@ public class InvestmentPlanController {
public
R
info
(
@PathVariable
(
"id"
)
Long
id
){
public
R
info
(
@PathVariable
(
"id"
)
Long
id
){
InvestmentPlanEntity
investmentPlan
=
investmentPlanService
.
getById
(
id
);
InvestmentPlanEntity
investmentPlan
=
investmentPlanService
.
getById
(
id
);
return
R
.
ok
().
put
(
"
investmentPlan
"
,
investmentPlan
);
return
R
.
ok
().
put
(
"
data
"
,
investmentPlan
);
}
}
/**
/**
...
...
src/main/java/com/wangtian/modules/manage/controller/SysDictController.java
View file @
4fff4212
...
@@ -2,6 +2,7 @@ package com.wangtian.modules.manage.controller;
...
@@ -2,6 +2,7 @@ package com.wangtian.modules.manage.controller;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.sitech.idworkstarter.IdWorkService
;
import
com.sitech.idworkstarter.IdWorkService
;
import
com.wangtian.common.annotation.SysLog
;
import
com.wangtian.common.utils.PageUtils
;
import
com.wangtian.common.utils.PageUtils
;
import
com.wangtian.common.utils.R
;
import
com.wangtian.common.utils.R
;
import
com.wangtian.common.validator.ValidatorUtils
;
import
com.wangtian.common.validator.ValidatorUtils
;
...
@@ -43,7 +44,7 @@ public class SysDictController extends AbstractController {
...
@@ -43,7 +44,7 @@ public class SysDictController extends AbstractController {
//@RequiresPermissions("manage:sysdict:list")
//@RequiresPermissions("manage:sysdict:list")
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
){
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
){
PageUtils
page
=
sysDictService
.
queryPage
(
params
);
PageUtils
page
=
sysDictService
.
queryPage
(
params
);
return
R
.
ok
().
put
(
"
page
"
,
page
);
return
R
.
ok
().
put
(
"
data
"
,
page
);
}
}
...
@@ -54,13 +55,14 @@ public class SysDictController extends AbstractController {
...
@@ -54,13 +55,14 @@ public class SysDictController extends AbstractController {
//@RequiresPermissions("manage:sysdict:info")
//@RequiresPermissions("manage:sysdict:info")
public
R
info
(
@PathVariable
(
"id"
)
String
id
){
public
R
info
(
@PathVariable
(
"id"
)
String
id
){
SysDictEntity
sysDict
=
sysDictService
.
getById
(
id
);
SysDictEntity
sysDict
=
sysDictService
.
getById
(
id
);
return
R
.
ok
().
put
(
"
sysDict
"
,
sysDict
);
return
R
.
ok
().
put
(
"
data
"
,
sysDict
);
}
}
/**
/**
* 保存
* 保存
*/
*/
@RequestMapping
(
"/save"
)
@RequestMapping
(
"/save"
)
@SysLog
(
"新增字典"
)
// @RequiresPermissions("manage:sysdict:save")
// @RequiresPermissions("manage:sysdict:save")
public
R
save
(
@RequestBody
SysDictForm
sysDict
){
public
R
save
(
@RequestBody
SysDictForm
sysDict
){
//校验参数
//校验参数
...
@@ -81,6 +83,7 @@ public class SysDictController extends AbstractController {
...
@@ -81,6 +83,7 @@ public class SysDictController extends AbstractController {
/**
/**
* 修改
* 修改
*/
*/
@SysLog
(
"修改字典"
)
@RequestMapping
(
"/update"
)
@RequestMapping
(
"/update"
)
//@RequiresPermissions("manage:sysdict:update")
//@RequiresPermissions("manage:sysdict:update")
public
R
update
(
@RequestBody
SysDictForm
sysDict
){
public
R
update
(
@RequestBody
SysDictForm
sysDict
){
...
@@ -100,6 +103,7 @@ public class SysDictController extends AbstractController {
...
@@ -100,6 +103,7 @@ public class SysDictController extends AbstractController {
/**
/**
* 删除
* 删除
*/
*/
@SysLog
(
"删除字典"
)
@RequestMapping
(
"/delete"
)
@RequestMapping
(
"/delete"
)
//@RequiresPermissions("manage:sysdict:delete")
//@RequiresPermissions("manage:sysdict:delete")
public
R
delete
(
@RequestBody
String
[]
ids
){
public
R
delete
(
@RequestBody
String
[]
ids
){
...
...
src/main/java/com/wangtian/modules/manage/controller/SysDictItemController.java
View file @
4fff4212
package
com
.
wangtian
.
modules
.
manage
.
controller
;
package
com
.
wangtian
.
modules
.
manage
.
controller
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.sitech.idworkstarter.IdWorkService
;
import
com.wangtian.common.annotation.SysLog
;
import
com.wangtian.common.utils.PageUtils
;
import
com.wangtian.common.utils.PageUtils
;
import
com.wangtian.common.utils.R
;
import
com.wangtian.common.utils.R
;
import
com.wangtian.common.validator.ValidatorUtils
;
import
com.wangtian.common.validator.group.AddGroup
;
import
com.wangtian.common.validator.group.UpdateGroup
;
import
com.wangtian.modules.manage.entity.SysDictItemEntity
;
import
com.wangtian.modules.manage.entity.SysDictItemEntity
;
import
com.wangtian.modules.manage.form.SysDictItemForm
;
import
com.wangtian.modules.manage.service.SysDictItemService
;
import
com.wangtian.modules.manage.service.SysDictItemService
;
import
com.wangtian.modules.sys.controller.AbstractController
;
import
com.wangtian.modules.sys.entity.SysUserEntity
;
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
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -21,9 +31,11 @@ import java.util.Map;
...
@@ -21,9 +31,11 @@ import java.util.Map;
*/
*/
@RestController
@RestController
@RequestMapping
(
"manage/sysdictitem"
)
@RequestMapping
(
"manage/sysdictitem"
)
public
class
SysDictItemController
{
public
class
SysDictItemController
extends
AbstractController
{
@Autowired
@Autowired
private
SysDictItemService
sysDictItemService
;
private
SysDictItemService
sysDictItemService
;
@Autowired
private
IdWorkService
idWorkService
;
/**
/**
* 列表
* 列表
...
@@ -33,7 +45,7 @@ public class SysDictItemController {
...
@@ -33,7 +45,7 @@ public class SysDictItemController {
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
){
public
R
list
(
@RequestParam
Map
<
String
,
Object
>
params
){
PageUtils
page
=
sysDictItemService
.
queryPage
(
params
);
PageUtils
page
=
sysDictItemService
.
queryPage
(
params
);
return
R
.
ok
().
put
(
"
page
"
,
page
);
return
R
.
ok
().
put
(
"
data
"
,
page
);
}
}
...
@@ -45,34 +57,55 @@ public class SysDictItemController {
...
@@ -45,34 +57,55 @@ public class SysDictItemController {
public
R
info
(
@PathVariable
(
"id"
)
String
id
){
public
R
info
(
@PathVariable
(
"id"
)
String
id
){
SysDictItemEntity
sysDictItem
=
sysDictItemService
.
getById
(
id
);
SysDictItemEntity
sysDictItem
=
sysDictItemService
.
getById
(
id
);
return
R
.
ok
().
put
(
"
sysDictItem
"
,
sysDictItem
);
return
R
.
ok
().
put
(
"
data
"
,
sysDictItem
);
}
}
/**
/**
* 保存
* 保存
*/
*/
@RequestMapping
(
"/save"
)
@RequestMapping
(
"/save"
)
@SysLog
(
"新增字典条目值"
)
//@RequiresPermissions("manage:sysdictitem:save")
//@RequiresPermissions("manage:sysdictitem:save")
public
R
save
(
@RequestBody
SysDictItemEntity
sysDictItem
){
public
R
save
(
@RequestBody
SysDictItemForm
sysDictItemForm
){
sysDictItemService
.
save
(
sysDictItem
);
//校验参数
ValidatorUtils
.
validateEntity
(
sysDictItemForm
,
AddGroup
.
class
);
//转化实体对象
SysDictItemEntity
sysDictItemEntity
=
new
SysDictItemEntity
();
BeanUtil
.
copyProperties
(
sysDictItemForm
,
sysDictItemEntity
);
sysDictItemEntity
.
setId
(
idWorkService
.
getSEQByKey
(
"id_seq"
));
//获取登录用户信息
SysUserEntity
loginUser
=
getUser
();
sysDictItemEntity
.
setCreateUserId
(
loginUser
.
getUserId
());
sysDictItemEntity
.
setCreateUserName
(
loginUser
.
getUsername
());
sysDictItemEntity
.
setCreateTime
(
new
Date
());
sysDictItemService
.
save
(
sysDictItemEntity
);
return
R
.
ok
();
return
R
.
ok
();
}
}
/**
/**
* 修改
* 修改
*/
*/
@SysLog
(
"修改字典条目值"
)
@RequestMapping
(
"/update"
)
@RequestMapping
(
"/update"
)
// @RequiresPermissions("manage:sysdictitem:update")
// @RequiresPermissions("manage:sysdictitem:update")
public
R
update
(
@RequestBody
SysDictItemEntity
sysDictItem
){
public
R
update
(
@RequestBody
SysDictItemForm
sysDictItemForm
){
sysDictItemService
.
updateById
(
sysDictItem
);
ValidatorUtils
.
validateEntity
(
sysDictItemForm
,
UpdateGroup
.
class
);
//转化实体对象
SysDictItemEntity
sysDictItemEntity
=
new
SysDictItemEntity
();
BeanUtil
.
copyProperties
(
sysDictItemForm
,
sysDictItemEntity
);
//获取登录用户信息
SysUserEntity
loginUser
=
getUser
();
sysDictItemEntity
.
setUpdateTime
(
new
Date
());
sysDictItemEntity
.
setUpdateUserName
(
loginUser
.
getUsername
());
sysDictItemEntity
.
setUpdateUserId
(
loginUser
.
getUserId
());
sysDictItemService
.
updateById
(
sysDictItemEntity
);
return
R
.
ok
();
return
R
.
ok
();
}
}
/**
/**
* 删除
* 删除
*/
*/
@SysLog
(
"删除字典条目值"
)
@RequestMapping
(
"/delete"
)
@RequestMapping
(
"/delete"
)
// @RequiresPermissions("manage:sysdictitem:delete")
// @RequiresPermissions("manage:sysdictitem:delete")
public
R
delete
(
@RequestBody
String
[]
ids
){
public
R
delete
(
@RequestBody
String
[]
ids
){
...
...
src/main/java/com/wangtian/modules/manage/service/impl/SysDictItemServiceImpl.java
View file @
4fff4212
...
@@ -20,7 +20,9 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemDao, SysDictI
...
@@ -20,7 +20,9 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemDao, SysDictI
public
PageUtils
queryPage
(
Map
<
String
,
Object
>
params
)
{
public
PageUtils
queryPage
(
Map
<
String
,
Object
>
params
)
{
IPage
<
SysDictItemEntity
>
page
=
this
.
page
(
IPage
<
SysDictItemEntity
>
page
=
this
.
page
(
new
Query
<
SysDictItemEntity
>().
getPage
(
params
),
new
Query
<
SysDictItemEntity
>().
getPage
(
params
),
new
QueryWrapper
<
SysDictItemEntity
>().
eq
(
"is_publish"
,
1
)
new
QueryWrapper
<
SysDictItemEntity
>()
.
eq
(
"is_publish"
,
1
)
);
);
return
new
PageUtils
(
page
);
return
new
PageUtils
(
page
);
...
...
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