Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center
Commits
8f012afe
Commit
8f012afe
authored
Feb 20, 2020
by
吴学德
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
套餐管理
parent
a6c5c26d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
121 additions
and
55 deletions
+121
-55
common/src/main/java/com/winsun/mapper/PackageMapper.java
+6
-1
service-manager/src/main/java/com/winsun/controller/PackageController.java
+103
-41
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
+12
-13
No files found.
common/src/main/java/com/winsun/mapper/PackageMapper.java
View file @
8f012afe
...
@@ -5,11 +5,16 @@ import com.winsun.bean.Package;
...
@@ -5,11 +5,16 @@ import com.winsun.bean.Package;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
import
java.util.Map
;
@Mapper
@Mapper
@Component
@Component
public
interface
PackageMapper
extends
BaseMapper
<
Package
>
{
public
interface
PackageMapper
extends
BaseMapper
<
Package
>
{
@Select
(
"SELECT cdma_disc_desc as cdmaDiscDesc FROM hhr_xyzx_yd_yrym_list GROUP BY cdma_disc_desc"
)
List
<
Map
<
String
,
Object
>>
packageAll
();
}
}
service-manager/src/main/java/com/winsun/controller/PackageController.java
View file @
8f012afe
...
@@ -10,6 +10,7 @@ import com.winsun.auth.core.base.controller.BaseController;
...
@@ -10,6 +10,7 @@ import com.winsun.auth.core.base.controller.BaseController;
import
com.winsun.auth.core.common.model.ResponseData
;
import
com.winsun.auth.core.common.model.ResponseData
;
import
com.winsun.auth.core.shiro.ShiroUser
;
import
com.winsun.auth.core.shiro.ShiroUser
;
import
com.winsun.bean.Package
;
import
com.winsun.bean.Package
;
import
com.winsun.bean.SchoolPackage
;
import
com.winsun.mapper.PackageMapper
;
import
com.winsun.mapper.PackageMapper
;
import
com.winsun.mapper.SchoolPackageMapper
;
import
com.winsun.mapper.SchoolPackageMapper
;
import
com.winsun.utils.MyBatisPlusUpdateUtils
;
import
com.winsun.utils.MyBatisPlusUpdateUtils
;
...
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
...
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -31,7 +33,7 @@ import java.util.Map;
...
@@ -31,7 +33,7 @@ import java.util.Map;
*/
*/
@Slf4j
@Slf4j
@RestController
@RestController
@RequestMapping
(
"/
school
/package"
)
@RequestMapping
(
"/
packageManagement
/package"
)
public
class
PackageController
extends
BaseController
{
public
class
PackageController
extends
BaseController
{
private
static
PackageMapper
packageMapper
;
private
static
PackageMapper
packageMapper
;
...
@@ -44,65 +46,125 @@ public class PackageController extends BaseController {
...
@@ -44,65 +46,125 @@ public class PackageController extends BaseController {
PackageController
.
schoolPackageMapper
=
schoolPackageMapper
;
PackageController
.
schoolPackageMapper
=
schoolPackageMapper
;
}
}
/**
*
* @param id
* @param packageName
* @param name
* @param isXbCard
* @param monthFee
* @param flow
* @param voice
* @param xbId
* @param warmTip
* @param explains
* @return
*/
@Permission
(
menuname
=
"添加套餐信息"
,
value
=
"insert"
,
method
=
RequestMethod
.
POST
)
@Permission
(
menuname
=
"添加套餐信息"
,
value
=
"insert"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
insertPackage
(
@RequestParam
(
"package"
)
String
pack
)
{
public
ResponseData
<
String
>
insertPackage
(
@RequestParam
(
"id"
)
String
id
,
@RequestParam
(
"packageName"
)
String
packageName
,
@RequestParam
(
"name"
)
String
name
,
@RequestParam
(
"isXbCard"
)
int
isXbCard
ShiroUser
user
=
getShiroUser
();
,
@RequestParam
(
"monthFee"
)
String
monthFee
,
@RequestParam
(
"flow"
)
String
flow
,
@RequestParam
(
"voice"
)
String
voice
if
(!
user
.
getRoleNames
().
stream
().
anyMatch
(
roleName
->
StringUtils
.
equalsAny
(
roleName
,
"超级管理员"
)))
{
,
@RequestParam
(
"xbId"
)
String
xbId
,
@RequestParam
(
"warmTip"
)
String
warmTip
,
@RequestParam
(
"explains"
)
String
explains
)
{
return
ResponseData
.
error
(
"无数据权限"
);
Package
aPackage
=
new
Package
();
aPackage
.
setPackageName
(
packageName
);
aPackage
.
setName
(
name
);
aPackage
.
setIsXbCard
(
isXbCard
);
aPackage
.
setMonthFee
(
monthFee
);
aPackage
.
setFlow
(
flow
);
aPackage
.
setVoice
(
voice
);
aPackage
.
setXbId
(
xbId
);
aPackage
.
setWarmTip
(
warmTip
);
aPackage
.
setExplains
(
explains
);
Integer
insert
=
packageMapper
.
insert
(
aPackage
);
if
(
insert
==
1
){
log
.
info
(
"套餐信息新增完毕,id: {}"
,
aPackage
.
getId
());
return
ResponseData
.
success
(
"新增完毕!"
);
}
}
Package
aPackage
=
JSON
.
parseObject
(
pack
,
Package
.
class
);
log
.
info
(
"套餐信息新增失败,id: {}"
,
aPackage
.
getId
());
packageMapper
.
insert
(
aPackage
);
return
ResponseData
.
success
(
"新增失败!"
);
return
ResponseData
.
success
(
"添加完毕!"
);
}
}
/**
*
* @param id
* @return
*/
@Permission
(
menuname
=
"删除套餐信息"
,
value
=
"delete"
,
method
=
RequestMethod
.
POST
)
@Permission
(
menuname
=
"删除套餐信息"
,
value
=
"delete"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
deletePackage
(
@RequestParam
(
"id"
)
String
id
)
{
public
ResponseData
<
String
>
deletePackage
(
@RequestParam
(
"id"
)
int
id
)
{
ShiroUser
user
=
getShiroUser
();
Integer
integer
=
packageMapper
.
deleteById
(
id
);
if
(!
user
.
getRoleNames
().
stream
().
anyMatch
(
roleName
->
StringUtils
.
equalsAny
(
roleName
,
"超级管理员"
)))
{
return
ResponseData
.
error
(
"无数据权限"
);
}
packageMapper
.
deleteById
(
id
);
//删除中间表信息
//删除中间表信息
schoolPackageMapper
.
deleteIntermediateTableByPackage
(
id
);
EntityWrapper
<
SchoolPackage
>
schoolPackagewrapper
=
new
EntityWrapper
<>();
return
ResponseData
.
success
(
"删除完毕!"
);
schoolPackagewrapper
.
eq
(
"package_id"
,
id
);
schoolPackageMapper
.
delete
(
schoolPackagewrapper
);
if
(
integer
==
1
){
log
.
info
(
"套餐信息删除完毕,删除id: {}"
,
id
);
return
ResponseData
.
success
(
"删除完毕!"
);
}
log
.
info
(
"套餐信息删除失败,删除id: {}"
,
id
);
return
ResponseData
.
success
(
"删除失败!"
);
}
}
/**
*
* @param id
* @param packageName
* @param name
* @param isXbCard
* @param monthFee
* @param flow
* @param voice
* @param xbId
* @param warmTip
* @param explains
* @return
*/
@Permission
(
menuname
=
"修改套餐信息"
,
value
=
"update"
,
method
=
RequestMethod
.
POST
)
@Permission
(
menuname
=
"修改套餐信息"
,
value
=
"update"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
updatePackage
(
@RequestParam
(
"package"
)
String
pack
)
{
public
ResponseData
<
String
>
updatePackage
(
@RequestParam
(
"id"
)
String
id
,
@RequestParam
(
"packageName"
)
String
packageName
,
@RequestParam
(
"name"
)
String
name
,
@RequestParam
(
"isXbCard"
)
String
isXbCard
ShiroUser
user
=
getShiroUser
();
,
@RequestParam
(
"monthFee"
)
String
monthFee
,
@RequestParam
(
"flow"
)
String
flow
,
@RequestParam
(
"voice"
)
String
voice
if
(!
user
.
getRoleNames
().
stream
().
anyMatch
(
roleName
->
StringUtils
.
equalsAny
(
roleName
,
"超级管理员"
)))
{
,
@RequestParam
(
"xbId"
)
String
xbId
,
@RequestParam
(
"warmTip"
)
String
warmTip
,
@RequestParam
(
"explains"
)
String
explains
)
{
return
ResponseData
.
error
(
"无数据权限"
);
}
Package
aPackage
=
JSON
.
parseObject
(
pack
,
Package
.
class
);
Wrapper
wrapper
=
new
EntityWrapper
<>();
Wrapper
wrapper
=
new
EntityWrapper
<>();
wrapper
.
eq
(
"id"
,
aPackage
.
getId
());
wrapper
.
eq
(
"id"
,
id
);
/**
* 待定............................
*/
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
dataMapping
.
put
(
"name"
,
""
);
dataMapping
.
put
(
"package_name"
,
packageName
);
packageMapper
.
updateForSet
(
MyBatisPlusUpdateUtils
.
toUpdateSet
(
dataMapping
),
wrapper
);
dataMapping
.
put
(
"name"
,
name
);
return
ResponseData
.
success
(
"修改完毕!"
);
dataMapping
.
put
(
"is_xb_card"
,
isXbCard
);
dataMapping
.
put
(
"month_fee"
,
monthFee
);
dataMapping
.
put
(
"flow"
,
flow
);
dataMapping
.
put
(
"voice"
,
voice
);
dataMapping
.
put
(
"xb_id"
,
xbId
);
dataMapping
.
put
(
"warm_tip"
,
warmTip
);
dataMapping
.
put
(
"explains"
,
explains
);
Integer
integer
=
packageMapper
.
updateForSet
(
MyBatisPlusUpdateUtils
.
toUpdateSet
(
dataMapping
),
wrapper
);
if
(
integer
==
1
){
log
.
info
(
"成功修改完毕套餐信息"
);
return
ResponseData
.
success
(
"修改完毕!"
);
}
else
{
log
.
info
(
"修改失败套餐信息"
);
return
ResponseData
.
error
(
"修改失败!"
);
}
}
}
@Permission
(
menuname
=
"查询套餐信息"
,
value
=
"list"
,
method
=
RequestMethod
.
POST
)
@Permission
(
menuname
=
"查询套餐信息"
,
value
=
"list"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
Page
<
Package
>>
listPackage
(
@RequestParam
(
"name"
)
String
name
,
@RequestParam
(
"type"
)
String
type
,
public
ResponseData
<
Page
<
Package
>>
listPackage
(
@RequestParam
(
"name"
)
String
name
,
@RequestParam
(
name
=
"pageNo"
,
required
=
false
)
int
pageIndex
,
@RequestParam
(
"packageName"
)
String
packageName
,
@RequestParam
(
"status"
)
String
status
,
@RequestParam
(
"isXbCard"
)
String
isXbCard
,
@RequestParam
(
name
=
"pageIndex"
,
required
=
false
)
int
pageIndex
,
@RequestParam
(
name
=
"pageSize"
,
required
=
false
)
int
pageSize
)
{
@RequestParam
(
name
=
"pageSize"
,
required
=
false
)
int
pageSize
)
{
ShiroUser
user
=
getShiroUser
();
if
(!
user
.
getRoleNames
().
stream
().
anyMatch
(
roleName
->
StringUtils
.
equalsAny
(
roleName
,
"超级管理员"
)))
{
return
ResponseData
.
error
(
"无数据权限"
);
}
Wrapper
<
Package
>
wrapper
=
new
EntityWrapper
();
Wrapper
<
Package
>
wrapper
=
new
EntityWrapper
();
wrapper
.
like
(
StringUtils
.
isNotBlank
(
name
),
"name"
,
name
,
SqlLike
.
DEFAULT
);
wrapper
.
like
(
StringUtils
.
isNotBlank
(
name
),
"package_name"
,
name
,
SqlLike
.
DEFAULT
);
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
type
),
"type"
,
Integer
.
parseInt
(
type
));
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
status
),
"status"
,
status
);
wrapper
.
like
(
StringUtils
.
isNotBlank
(
packageName
),
"package_name"
,
packageName
,
SqlLike
.
DEFAULT
);
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
isXbCard
),
"is_xb_card"
,
Integer
.
parseInt
(
isXbCard
));
Page
<
Package
>
page
=
new
Page
<>(
pageIndex
,
pageSize
);
Page
<
Package
>
page
=
new
Page
<>(
pageIndex
,
pageSize
);
List
<
Package
>
aPackage
=
packageMapper
.
selectPage
(
page
,
wrapper
);
List
<
Package
>
aPackage
=
packageMapper
.
selectPage
(
page
,
wrapper
);
page
.
setRecords
(
aPackage
);
page
.
setRecords
(
aPackage
);
return
ResponseData
.
success
(
page
,
"查询完毕!"
);
return
ResponseData
.
success
(
page
,
"查询完毕!"
);
}
}
@Permission
(
menuname
=
"套餐全称列表"
,
value
=
"packageAllList"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
String
>>
packageAll
()
{
ArrayList
<
String
>
arrayList
=
new
ArrayList
<>();
final
List
<
Map
<
String
,
Object
>>
maps
=
packageMapper
.
packageAll
();
for
(
Map
<
String
,
Object
>
map
:
maps
)
{
if
(
map
!=
null
){
arrayList
.
add
(
map
.
get
(
"cdmaDiscDesc"
).
toString
());
}
}
return
ResponseData
.
success
(
arrayList
,
"查询完毕!"
);
}
}
}
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
View file @
8f012afe
...
@@ -99,16 +99,15 @@ public class SchoolManagementController extends BaseController {
...
@@ -99,16 +99,15 @@ public class SchoolManagementController extends BaseController {
}
}
@Permission
(
menuname
=
"删除學校信息"
,
value
=
"delete"
,
method
=
RequestMethod
.
POST
)
@Permission
(
menuname
=
"删除學校信息"
,
value
=
"hidestatus"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
deleteSchool
(
@RequestParam
(
"id"
)
String
id
)
{
public
ResponseData
<
String
>
deleteSchool
(
@RequestParam
(
"id"
)
String
id
,
@RequestParam
(
"status"
)
int
status
)
{
ShiroUser
user
=
getShiroUser
();
if
(!
user
.
getRoleNames
().
stream
().
anyMatch
(
roleName
->
StringUtils
.
equalsAny
(
roleName
,
"超级管理员"
)))
{
Integer
integer
=
schoolMapper
.
updateForSet
(
"status="
+
status
,
new
EntityWrapper
<
School
>().
eq
(
"id"
,
id
));
return
ResponseData
.
error
(
"无数据权限"
);
if
(
integer
==
1
){
return
ResponseData
.
success
(
"修改成功!"
);
}
}
schoolMapper
.
deleteById
(
id
);
return
ResponseData
.
error
(
"修改失败"
);
//删除中间表信息
schoolPackageMapper
.
deleteIntermediateTableBySchool
(
id
);
return
ResponseData
.
success
(
"删除完毕!"
);
}
}
/**
/**
...
@@ -143,7 +142,7 @@ public class SchoolManagementController extends BaseController {
...
@@ -143,7 +142,7 @@ public class SchoolManagementController extends BaseController {
dataMapping
.
put
(
"is_showband"
,
isShowband
);
dataMapping
.
put
(
"is_showband"
,
isShowband
);
dataMapping
.
put
(
"is_showrh"
,
isShowrh
);
dataMapping
.
put
(
"is_showrh"
,
isShowrh
);
schoolMapper
.
updateForSet
(
MyBatisPlusUpdateUtils
.
toUpdateSet
(
dataMapping
),
wrapper
);
schoolMapper
.
updateForSet
(
MyBatisPlusUpdateUtils
.
toUpdateSet
(
dataMapping
),
wrapper
);
//插入学校与套餐中间表数据
if
(
StringUtils
.
isNotBlank
(
chosePages
)){
if
(
StringUtils
.
isNotBlank
(
chosePages
)){
String
[]
split
=
chosePages
.
split
(
","
);
String
[]
split
=
chosePages
.
split
(
","
);
if
(
split
.
length
<=
0
)
{
if
(
split
.
length
<=
0
)
{
...
@@ -185,19 +184,19 @@ public class SchoolManagementController extends BaseController {
...
@@ -185,19 +184,19 @@ public class SchoolManagementController extends BaseController {
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
status
),
"status"
,
status
);
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
status
),
"status"
,
status
);
Page
<
Map
<
String
,
Object
>>
page
=
new
Page
<>(
pageIndex
,
pageSize
);
Page
<
Map
<
String
,
Object
>>
page
=
new
Page
<>(
pageIndex
,
pageSize
);
List
<
Map
<
String
,
Object
>>
maps
=
schoolMapper
.
selectMapsPage
(
page
,
wrapper
);
List
<
Map
<
String
,
Object
>>
maps
=
schoolMapper
.
selectMapsPage
(
page
,
wrapper
);
//查询县分列表
Wrapper
<
School
>
wrapperSubName
=
new
EntityWrapper
();
Wrapper
<
School
>
wrapperSubName
=
new
EntityWrapper
();
wrapperSubName
.
setSqlSelect
(
"sub_name as subNameList"
).
groupBy
(
"sub_name"
);
wrapperSubName
.
setSqlSelect
(
"sub_name as subNameList"
).
groupBy
(
"sub_name"
);
List
<
Map
<
String
,
Object
>>
selectMaps
=
schoolMapper
.
selectMaps
(
wrapperSubName
);
List
<
Map
<
String
,
Object
>>
selectMaps
=
schoolMapper
.
selectMaps
(
wrapperSubName
);
EntityWrapper
<
Package
>
packagewrapper
=
new
EntityWrapper
<>();
EntityWrapper
<
Package
>
packagewrapper
=
new
EntityWrapper
<>();
packagewrapper
.
setSqlSelect
(
"id,package_name as packageName"
);
packagewrapper
.
setSqlSelect
(
"id,package_name as packageName"
);
List
<
Map
<
String
,
Object
>>
packageselectMaps
=
packageMapper
.
selectMaps
(
packagewrapper
);
List
<
Map
<
String
,
Object
>>
packageselectMaps
=
packageMapper
.
selectMaps
(
packagewrapper
);
//查询单宽学校名称
Wrapper
<
Product
>
productwrapper
=
new
EntityWrapper
();
Wrapper
<
Product
>
productwrapper
=
new
EntityWrapper
();
productwrapper
.
setSqlSelect
(
"product_id as productId,product_university as ProductUniversity"
);
productwrapper
.
setSqlSelect
(
"product_id as productId,product_university as ProductUniversity"
);
productwrapper
.
eq
(
"product_state"
,
"0"
);
productwrapper
.
eq
(
"product_state"
,
"0"
);
List
<
Map
<
String
,
Object
>>
products
=
productMapper
.
selectMaps
(
productwrapper
);
List
<
Map
<
String
,
Object
>>
products
=
productMapper
.
selectMaps
(
productwrapper
);
//存放县分下拉列表和单宽学校名称下拉列表
if
(!
CollectionUtils
.
isEmpty
(
maps
)){
if
(!
CollectionUtils
.
isEmpty
(
maps
)){
maps
.
get
(
0
).
put
(
"subNameList"
,
selectMaps
);
maps
.
get
(
0
).
put
(
"subNameList"
,
selectMaps
);
maps
.
get
(
0
).
put
(
"packageName"
,
packageselectMaps
);
maps
.
get
(
0
).
put
(
"packageName"
,
packageselectMaps
);
...
...
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