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
63fde646
Commit
63fde646
authored
Feb 12, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
学校,合伙人,套餐信息管理
parent
cda2c0a8
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
687 additions
and
1 deletions
+687
-1
common/pom.xml
+93
-0
common/src/main/java/com/winsun/bean/school/Package.java
+100
-0
common/src/main/java/com/winsun/bean/school/Salesperson.java
+92
-0
common/src/main/java/com/winsun/bean/school/School.java
+109
-0
common/src/main/java/com/winsun/mapper/school/PackageMapper.java
+11
-0
common/src/main/java/com/winsun/mapper/school/SalespersonMapper.java
+11
-0
common/src/main/java/com/winsun/mapper/school/SchoolMapper.java
+11
-0
common/src/main/java/com/winsun/utils/MyBatisPlusUpdateUtils.java
+62
-0
pom.xml
+2
-1
service-manager/pom.xml
+6
-0
service-manager/src/main/java/com/winsun/controller/PackageController.java
+57
-0
service-manager/src/main/java/com/winsun/controller/SalespersonController.java
+59
-0
service-manager/src/main/java/com/winsun/controller/SchoolController.java
+74
-0
No files found.
common/pom.xml
0 → 100644
View file @
63fde646
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
school-center
</artifactId>
<groupId>
com.winsun.gdtel.gztel
</groupId>
<version>
0.0.2
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
common
</artifactId>
<description>
系统公共模块
</description>
<version>
0.0.1
</version>
<dependencies>
<dependency>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
</dependency>
<dependency>
<groupId>
com.winsun.framework
</groupId>
<artifactId>
winsun-core-common
</artifactId>
</dependency>
<dependency>
<groupId>
com.winsun.framework
</groupId>
<artifactId>
winsun-core-api
</artifactId>
</dependency>
<!-- 数据库连接部分 -->
<dependency>
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus
</artifactId>
</dependency>
<dependency>
<groupId>
mysql
</groupId>
<artifactId>
mysql-connector-java
</artifactId>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
druid
</artifactId>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
</dependency>
<dependency>
<groupId>
commons-net
</groupId>
<artifactId>
commons-net
</artifactId>
<version>
${commons-net.version}
</version>
</dependency>
<dependency>
<groupId>
com.opencsv
</groupId>
<artifactId>
opencsv
</artifactId>
<version>
4.4
</version>
</dependency>
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<version>
2.4
</version>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
easyexcel
</artifactId>
<version>
1.1.2-beta4
</version>
</dependency>
<dependency>
<groupId>
net.sf.json-lib
</groupId>
<artifactId>
json-lib
</artifactId>
<version>
2.4
</version>
<classifier>
jdk15
</classifier>
</dependency>
<dependency>
<groupId>
net.sourceforge.jchardet
</groupId>
<artifactId>
jchardet
</artifactId>
<version>
1.0
</version>
</dependency>
<dependency>
<artifactId>
p6spy
</artifactId>
<groupId>
p6spy
</groupId>
</dependency>
<dependency>
<groupId>
com.baomidou
</groupId>
<artifactId>
dynamic-datasource-spring-boot-starter
</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
common/src/main/java/com/winsun/bean/school/Package.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
bean
.
school
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 套餐
*/
@Data
@TableName
(
"hhr_package"
)
public
class
Package
implements
Serializable
{
/**
* 主键
*/
@TableId
private
int
id
;
/**
*套餐名称
*/
private
String
name
;
/**
* 用户理解的套餐名
*/
private
String
packageName
;
/**
* 月基本费用
*/
private
String
monthFee
;
/**
* 流量
*/
private
String
flow
;
/**
* 语音
*/
private
String
voice
;
/**
* 介绍
*/
private
String
explains
;
/**
* 0:宽带,1:手机
*/
private
int
type
;
/**
* 状态
*/
private
String
status
;
/**
* 标志图
*/
private
String
logo
;
/**
* 广告图
*/
private
String
advImg
;
/**
* 常见问题
*/
private
String
question
;
/**
* 默认推荐套餐id
*/
private
String
newPackage
;
/**
* 温馨提示
*/
private
String
warmTip
;
/**
* 小白卡套餐id
*/
private
String
xbId
;
/**
* 是否是小白卡的标识,0小白卡 1普通卡
*/
private
int
isXbCard
;
}
common/src/main/java/com/winsun/bean/school/Salesperson.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
bean
.
school
;
import
com.baomidou.mybatisplus.annotations.TableField
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
*合伙人信息
*/
@Data
@TableName
(
"hhr_user"
)
public
class
Salesperson
implements
Serializable
{
/**
* 主键
*/
@TableId
private
String
id
;
/**
*电话号码(账号)
*/
private
String
phoneNum
;
/**
* 学校
*/
private
String
school
;
/**
* 密码
*/
private
String
password
;
/**
* 姓名
*/
private
String
name
;
/**
* 身份证
*/
private
String
idCard
;
/**
* 账号(尽量和手机号一致)
*/
private
String
account
;
/**
* 性别
*/
private
String
gender
;
/**
* 县分(区域)
*/
private
String
area
;
/**
* 年级(2018,2019)
*/
@TableField
(
value
=
"class"
)
private
String
Grade
;
/**
* 合伙人对应的微信账号
*/
private
String
wxId
;
/**
* 合伙人的状态
*/
private
int
state
;
/**
* 预实名账号id
*/
private
int
ysm
;
/**
* 督导id
*/
private
String
leaderId
;
}
common/src/main/java/com/winsun/bean/school/School.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
bean
.
school
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 学校信息
*/
@Data
@TableName
(
"hhr_school"
)
public
class
School
implements
Serializable
{
/**
* 主键
*/
@TableId
private
int
id
;
/**
*县分
*/
private
String
subName
;
/**
* 学校
*/
private
String
schoolName
;
/**
* 是否禁用(0禁用;1使用)
*/
private
int
status
;
/**
* 二维码扫码后默认办理套餐
*/
private
int
defaultPackage
;
/**
* 学校对应客服的二维码地址
*/
private
String
serviceQrcode
;
/**
* 揽装工号
*/
private
String
lzgh
;
/**
* 网点id
*/
private
String
netId
;
/**
* 宽带速率
*/
private
String
kdsl
;
/**
* 1包月2包年3包月包年
*/
private
String
feeType
;
/**
* 生成二维码的url
*/
private
String
url
;
/**
* 0小白卡 1普通卡
*/
private
int
isXb
;
/**
* 是否新装融合(0:否 1:是)
*/
private
int
netType
;
/**
* 是否收到电信卡,0:否,1:是
*/
private
int
isRecv
;
/**
* 是否显示0息购机0:否,1:是
*/
private
int
netPhone
;
/**
* 单宽id
*/
private
String
bandproductId
;
/**
* 显示宽带
*/
private
String
isShowband
;
/**
* 是否显示融合
*/
private
String
isShowrh
;
}
common/src/main/java/com/winsun/mapper/school/PackageMapper.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
mapper
.
school
;
import
com.baomidou.mybatisplus.mapper.BaseMapper
;
import
com.winsun.bean.school.Package
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Component
;
@Mapper
@Component
public
interface
PackageMapper
extends
BaseMapper
<
Package
>
{
}
common/src/main/java/com/winsun/mapper/school/SalespersonMapper.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
mapper
.
school
;
import
com.baomidou.mybatisplus.mapper.BaseMapper
;
import
com.winsun.bean.school.Salesperson
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Component
;
@Mapper
@Component
public
interface
SalespersonMapper
extends
BaseMapper
<
Salesperson
>
{
}
common/src/main/java/com/winsun/mapper/school/SchoolMapper.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
mapper
.
school
;
import
com.baomidou.mybatisplus.mapper.BaseMapper
;
import
com.winsun.bean.school.School
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Component
;
@Mapper
@Component
public
interface
SchoolMapper
extends
BaseMapper
<
School
>
{
}
common/src/main/java/com/winsun/utils/MyBatisPlusUpdateUtils.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
utils
;
import
com.winsun.auth.core.util.DateUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.validation.constraints.NotNull
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
/**
* 主要用于作为Mybatis-Plus的工具类使用
* @author Liph
* @datetime 2019-10-19/10/13 08:42
*/
public
class
MyBatisPlusUpdateUtils
{
/**
* 用于标记是否函数
*/
public
static
final
String
FUNC
=
"func:"
;
/**
* 将准备用于更新的Map转换成update set的SQL中set的部分
* 支持数据类型:String、Long、Integer、Double、Float、Date
* 其中:
* Date:通过DateUtil.format((Date)val, "yyyy-MM-dd HH:mm:ss")转化之后变成字符串形式生成
* String:如果包含工具类的常量FUNC开头,则认为是一个SQL的函数,切割之后原样生成;其他情况则添加前后"'"生成
* @param setMapper SQL set
* @return
*/
public
static
String
toUpdateSet
(
@NotNull
Map
<
String
,
?
extends
Object
>
setMapper
)
{
List
<
String
>
sqlSet
=
new
ArrayList
<>(
setMapper
.
size
());
setMapper
.
forEach
((
key
,
val
)
->
{
if
(
val
==
null
)
{
sqlSet
.
add
(
String
.
format
(
"%s = null"
,
key
));
}
else
if
(
val
instanceof
String
)
{
String
tmp
=
(
String
)
val
;
if
(
StringUtils
.
startsWith
(
tmp
,
FUNC
))
{
tmp
=
tmp
.
substring
(
FUNC
.
length
());
sqlSet
.
add
(
String
.
format
(
"%s = %s"
,
key
,
tmp
));
}
else
{
sqlSet
.
add
(
String
.
format
(
"%s = '%s'"
,
key
,
val
));
}
}
else
if
(
val
instanceof
Integer
)
{
sqlSet
.
add
(
String
.
format
(
"%s = %d"
,
key
,
val
));
}
else
if
(
val
instanceof
Long
)
{
sqlSet
.
add
(
String
.
format
(
"%s = %d"
,
key
,
val
));
}
else
if
(
val
instanceof
Float
)
{
sqlSet
.
add
(
String
.
format
(
"%s = %g"
,
key
,
val
));
}
else
if
(
val
instanceof
Double
)
{
sqlSet
.
add
(
String
.
format
(
"%s = %g"
,
key
,
val
));
}
else
if
(
val
instanceof
Date
)
{
sqlSet
.
add
(
String
.
format
(
"%s = '%s'"
,
key
,
DateUtil
.
format
((
Date
)
val
,
"yyyy-MM-dd HH:mm:ss"
)));
}
else
{
throw
new
NullPointerException
(
"生成更新代码失败,遇到不支持数据类型"
);
}
});
return
StringUtils
.
join
(
sqlSet
,
","
);
}
}
pom.xml
View file @
63fde646
...
...
@@ -13,6 +13,7 @@
<module>
gateway
</module>
<module>
eureka
</module>
<module>
task
</module>
<module>
common
</module>
</modules>
<packaging>
pom
</packaging>
<description>
外呼集约系统聚合
</description>
...
...
@@ -24,7 +25,7 @@
</parent>
<properties>
<
gdtel-jyyy-service.version>
0.0.1
</gdtel-jyyy-
service.version>
<
service.version>
0.0.1
</
service.version>
<commons-net.version>
3.3
</commons-net.version>
<p6spy.version>
3.8.0
</p6spy.version>
<dynamic-datasource.version>
2.5.6
</dynamic-datasource.version>
...
...
service-manager/pom.xml
View file @
63fde646
...
...
@@ -118,6 +118,12 @@
<groupId>
com.baomidou
</groupId>
<artifactId>
dynamic-datasource-spring-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
com.winsun.gdtel.gztel
</groupId>
<artifactId>
common
</artifactId>
<version>
${service.version}
</version>
</dependency>
</dependencies>
<build>
...
...
service-manager/src/main/java/com/winsun/controller/PackageController.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
controller
;
import
com.winsun.auth.core.annotion.Permission
;
import
com.winsun.auth.core.common.model.ResponseData
;
import
com.winsun.mapper.school.PackageMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @Author: chancy
* @Date: 2020/2/12 17:25
*/
@Slf4j
@RestController
@RequestMapping
(
"/school/package"
)
public
class
PackageController
{
private
static
PackageMapper
packageMapper
;
@Autowired
public
PackageController
(
PackageMapper
packageMapper
){
PackageController
.
packageMapper
=
packageMapper
;
}
@Permission
(
menuname
=
"添加套餐信息"
,
value
=
"insert"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
insertPackage
(){
return
ResponseData
.
success
(
"添加完毕!"
);
}
@Permission
(
menuname
=
"删除套餐信息"
,
value
=
"delete"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
deletePackage
(){
return
ResponseData
.
success
(
"删除完毕!"
);
}
@Permission
(
menuname
=
"修改套餐信息"
,
value
=
"update"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
updatePackage
(){
return
ResponseData
.
success
(
"修改完毕!"
);
}
@Permission
(
menuname
=
"查询套餐信息"
,
value
=
"select"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
Package
>>
selectPackage
(){
return
null
;
}
}
service-manager/src/main/java/com/winsun/controller/SalespersonController.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
controller
;
import
com.winsun.auth.core.annotion.Permission
;
import
com.winsun.auth.core.common.model.ResponseData
;
import
com.winsun.bean.school.Salesperson
;
import
com.winsun.mapper.school.SalespersonMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
*
* @Author: chancy
* @Date: 2020/2/12 17:26
*/
@Slf4j
@RestController
@RequestMapping
(
"/school/salesperson"
)
public
class
SalespersonController
{
private
static
SalespersonMapper
salespersonMapper
;
@Autowired
public
SalespersonController
(
SalespersonMapper
salespersonMapper
){
SalespersonController
.
salespersonMapper
=
salespersonMapper
;
}
@Permission
(
menuname
=
"添加合伙人信息"
,
value
=
"insert"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
insertSalesperson
(){
return
ResponseData
.
success
(
"添加完毕!"
);
}
@Permission
(
menuname
=
"删除合伙人信息"
,
value
=
"delete"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
deleteSalesperson
(){
return
ResponseData
.
success
(
"删除完毕!"
);
}
@Permission
(
menuname
=
"修改合伙人信息"
,
value
=
"update"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
updateSalesperson
(){
return
ResponseData
.
success
(
"修改完毕!"
);
}
@Permission
(
menuname
=
"查询合伙人信息"
,
value
=
"select"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
Salesperson
>>
selectSalesperson
(){
return
null
;
}
}
service-manager/src/main/java/com/winsun/controller/SchoolController.java
0 → 100644
View file @
63fde646
package
com
.
winsun
.
controller
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.mapper.EntityWrapper
;
import
com.baomidou.mybatisplus.mapper.Wrapper
;
import
com.winsun.auth.core.annotion.Permission
;
import
com.winsun.bean.school.School
;
import
com.winsun.mapper.school.SchoolMapper
;
import
com.winsun.utils.MyBatisPlusUpdateUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.winsun.auth.core.common.model.ResponseData
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
/**
* @Author: chancy
* @Date: 2020/2/12 17:25
*/
@Slf4j
@RestController
@RequestMapping
(
"/school/school"
)
public
class
SchoolController
{
private
static
SchoolMapper
schoolMapper
;
@Autowired
public
SchoolController
(
SchoolMapper
schoolMapper
){
SchoolController
.
schoolMapper
=
schoolMapper
;
}
@Permission
(
menuname
=
"添加學校信息"
,
value
=
"insert"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
insertSchool
(
@RequestParam
(
"school"
)
String
school
){
School
school1
=
JSON
.
parseObject
(
school
,
School
.
class
);
schoolMapper
.
insert
(
school1
);
return
ResponseData
.
success
(
"添加完毕!"
);
}
@Permission
(
menuname
=
"删除學校信息"
,
value
=
"delete"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
deleteSchool
(
@RequestParam
(
"id"
)
String
id
){
schoolMapper
.
deleteById
(
id
);
return
ResponseData
.
success
(
"删除完毕!"
);
}
@Permission
(
menuname
=
"修改學校信息"
,
value
=
"update"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
updateSchool
(
@RequestParam
(
"school"
)
String
school
){
School
school1
=
JSON
.
parseObject
(
school
,
School
.
class
);
Wrapper
wrapper
=
new
EntityWrapper
<>();
wrapper
.
eq
(
"id"
,
school1
.
getId
());
/**
* 待定............................
*/
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
dataMapping
.
put
(
"school_name"
,
""
);
schoolMapper
.
updateForSet
(
MyBatisPlusUpdateUtils
.
toUpdateSet
(
dataMapping
),
wrapper
);
return
ResponseData
.
success
(
"修改完毕!"
);
}
@Permission
(
menuname
=
"查询學校信息"
,
value
=
"select"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
School
>>
selectSchool
(
@RequestParam
(
"subName"
)
String
subName
,
@RequestParam
(
"status"
)
String
status
,
@RequestParam
(
"schoolName"
)
String
schoolName
){
return
null
;
}
}
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