Skip to content

G
gdtel-gztel-school-center
Commit 9a8d481a by 吴学德
Options

Merge remote-tracking branch 'origin/master'

parents 2d1b91e3 b9ae485d
Showing with 169 additions and 47 deletions
common/src/main/java/com/winsun/bean/Salesperson.java
...@@ -65,7 +65,7 @@ public class Salesperson implements Serializable { ...@@ -65,7 +65,7 @@ public class Salesperson implements Serializable {
* 年级（2018,2019） * 年级（2018,2019）
*/ */
@TableField(value = "class") @TableField(value = "class")
private String Grade; private String grade;
/** /**
* 合伙人对应的微信账号 * 合伙人对应的微信账号
......
service-manager/src/main/java/com/winsun/controller/PackageController.java
package com.winsun.controller; package com.winsun.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission; import com.winsun.auth.core.annotion.Permission;
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.bean.Package;
import com.winsun.mapper.PackageMapper; import com.winsun.mapper.PackageMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @Author: chancy * @Author: chancy
...@@ -18,40 +31,72 @@ import java.util.List; ...@@ -18,40 +31,72 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/school/package") @RequestMapping("/school/package")
public class PackageController { public class PackageController extends BaseController {
private static PackageMapper packageMapper; private static PackageMapper packageMapper;
@Autowired @Autowired
public PackageController(PackageMapper packageMapper){ public PackageController(PackageMapper packageMapper) {
PackageController.packageMapper=packageMapper; PackageController.packageMapper = packageMapper;
} }
@Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST) @Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertPackage(){ public ResponseData<String> insertPackage(@RequestParam("package") String pack) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Package aPackage = JSON.parseObject(pack, Package.class);
packageMapper.insert(aPackage);
return ResponseData.success("添加完毕！"); return ResponseData.success("添加完毕！");
} }
@Permission(menuname = "删除套餐信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除套餐信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deletePackage(){ public ResponseData<String> deletePackage(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
packageMapper.deleteById(id);
return ResponseData.success("删除完毕！"); return ResponseData.success("删除完毕！");
} }
@Permission(menuname = "修改套餐信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改套餐信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePackage(){ public ResponseData<String> updatePackage(@RequestParam("package") String pack) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Package aPackage = JSON.parseObject(pack, Package.class);
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", aPackage.getId());
/**
* 待定............................
*/
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("name", "");
packageMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改完毕！");
} }
@Permission(menuname = "查询套餐信息", value = "select", method = RequestMethod.POST) @Permission(menuname = "查询套餐信息", value = "select", method = RequestMethod.POST)
public ResponseData<List<Package>> selectPackage(){ public ResponseData<Page<Package>> selectPackage(@RequestParam("name") String name, @RequestParam("type") String type,
@RequestParam("packageName") String packageName, @RequestParam("status") String status,
@RequestParam("isXbCard") String isXbCard, @RequestParam(name = "pageIndex", required = false) int pageIndex,
return null; @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.like(StringUtils.isNotBlank(name), "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);
List<Package> aPackage = packageMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
return ResponseData.success(page, "查询完毕！");
} }
} }
service-manager/src/main/java/com/winsun/controller/SalespersonController.java
package com.winsun.controller; package com.winsun.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission; import com.winsun.auth.core.annotion.Permission;
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.bean.Salesperson; import com.winsun.bean.Salesperson;
import com.winsun.mapper.SalespersonMapper; import com.winsun.mapper.SalespersonMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
*
* @Author: chancy * @Author: chancy
* @Date: 2020/2/12 17:26 * @Date: 2020/2/12 17:26
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/school/salesperson") @RequestMapping("/school/salesperson")
public class SalespersonController { public class SalespersonController extends BaseController {
private static SalespersonMapper salespersonMapper; private static SalespersonMapper salespersonMapper;
@Autowired @Autowired
public SalespersonController(SalespersonMapper salespersonMapper){ public SalespersonController(SalespersonMapper salespersonMapper) {
SalespersonController.salespersonMapper=salespersonMapper; SalespersonController.salespersonMapper = salespersonMapper;
} }
@Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST) @Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertSalesperson(){ public ResponseData<String> insertSalesperson(@RequestParam("salesperson") String salesperson) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Salesperson sale = JSON.parseObject(salesperson, Salesperson.class);
salespersonMapper.insert(sale);
return ResponseData.success("添加完毕！"); return ResponseData.success("添加完毕！");
} }
@Permission(menuname = "删除合伙人信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除合伙人信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deleteSalesperson(){ public ResponseData<String> deleteSalesperson(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
salespersonMapper.deleteById(id);
return ResponseData.success("删除完毕！"); return ResponseData.success("删除完毕！");
} }
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateSalesperson(){ public ResponseData<String> updateSalesperson(@RequestParam("salesperson") String salesperson) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Salesperson sale = JSON.parseObject(salesperson, Salesperson.class);
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", sale.getId());
/**
* 待定............................
*/
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("phoneNum", "");
salespersonMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改完毕！");
} }
@Permission(menuname = "查询合伙人信息", value = "select", method = RequestMethod.POST) @Permission(menuname = "查询合伙人信息", value = "select", method = RequestMethod.POST)
public ResponseData<List<Salesperson>> selectSalesperson(){ public ResponseData<Page<Salesperson>> selectSalesperson(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status,
@RequestParam("school") String school, @RequestParam("account") String account,
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
return null; @RequestParam("grade") String grade,
@RequestParam(name = "pageIndex", required = false) int pageIndex,@RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Salesperson> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(phoneNum), "phone_num", phoneNum, SqlLike.LEFT);
wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(account), "account", account, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(status), "status", Integer.parseInt(status));
wrapper.eq(StringUtils.isNotBlank(grade), "grade", grade);
wrapper.eq(StringUtils.isNotBlank(area), "area", area);
wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender);
Page<Salesperson> page = new Page<>(pageIndex, pageSize);
List<Salesperson> salespeople = salespersonMapper.selectPage(page, wrapper);
page.setRecords(salespeople);
return ResponseData.success(page, "查询完毕！");
} }
} }
service-manager/src/main/java/com/winsun/controller/SchoolController.java
package com.winsun.controller; package com.winsun.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission; import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.mapper.SchoolMapper; import com.winsun.mapper.SchoolMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
...@@ -26,48 +31,73 @@ import java.util.Map; ...@@ -26,48 +31,73 @@ import java.util.Map;
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/school/school") @RequestMapping("/school/school")
public class SchoolController { public class SchoolController extends BaseController {
private static SchoolMapper schoolMapper; private static SchoolMapper schoolMapper;
@Autowired @Autowired
public SchoolController(SchoolMapper schoolMapper){ public SchoolController(SchoolMapper schoolMapper) {
SchoolController.schoolMapper=schoolMapper; SchoolController.schoolMapper = schoolMapper;
} }
@Permission(menuname = "添加學校信息", value = "insert", method = RequestMethod.POST) @Permission(menuname = "添加學校信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertSchool(@RequestParam("school")String school){ public ResponseData<String> insertSchool(@RequestParam("school") String school) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
School school1 = JSON.parseObject(school, School.class); School school1 = JSON.parseObject(school, School.class);
schoolMapper.insert(school1); schoolMapper.insert(school1);
return ResponseData.success("添加完毕！"); return ResponseData.success("添加完毕！");
} }
@Permission(menuname = "删除學校信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除學校信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deleteSchool(@RequestParam("id")String id){ public ResponseData<String> deleteSchool(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
schoolMapper.deleteById(id); schoolMapper.deleteById(id);
return ResponseData.success("删除完毕！"); return ResponseData.success("删除完毕！");
} }
@Permission(menuname = "修改學校信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改學校信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateSchool(@RequestParam("school")String school){ public ResponseData<String> updateSchool(@RequestParam("school") String school) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
School school1 = JSON.parseObject(school, School.class); School school1 = JSON.parseObject(school, School.class);
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",school1.getId()); wrapper.eq("id", school1.getId());
/** /**
* 待定............................ * 待定............................
*/ */
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("school_name",""); dataMapping.put("school_name", "");
schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改完毕！");
} }
@Permission(menuname = "查询學校信息", value = "select", method = RequestMethod.POST) @Permission(menuname = "查询學校信息", value = "select", method = RequestMethod.POST)
public ResponseData<List<School>> selectSchool(@RequestParam("subName")String subName,@RequestParam("status")String status, public ResponseData<Page<School>> selectSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
@RequestParam("schoolName")String schoolName){ @RequestParam("schoolName") String schoolName, @RequestParam("isXb") String isXb,
@RequestParam("netType") String netType, @RequestParam(name = "pageIndex", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
return null; ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<School> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(schoolName), "school_name", schoolName, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
wrapper.eq(StringUtils.isNotBlank(status), "status", Integer.parseInt(status));
wrapper.eq(StringUtils.isNotBlank(isXb), "is_xb", Integer.parseInt(isXb));
wrapper.eq(StringUtils.isNotBlank(netType), "net_type", Integer.parseInt(netType));
Page<School> page = new Page<>(pageIndex, pageSize);
List<School> schools = schoolMapper.selectPage(page, wrapper);
page.setRecords(schools);
return ResponseData.success(page, "查询完毕！");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment