Commit 400080d8 by 伍思炜

一人一码平台院校管理模块新增删除单个院校功能

parent 1602008f
......@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
......@@ -67,7 +68,7 @@ public class SchoolManagementController extends BaseController {
private static String SL_APP_ID = "随身厅终端编码";
private static String SL_APP_KEY = "随身厅终端密匙";
private static SchoolMapper schoolMapper;
private static SchoolMapper schoolMapper;
private static SchoolPackageMapper schoolPackageMapper;
......@@ -76,13 +77,13 @@ public class SchoolManagementController extends BaseController {
private static ProductMapper productMapper;
//默认路径
private static String DEFAULTPATH="images/schoolPartner/";
private static String DEFAULTPATH = "images/schoolPartner/";
private static String FILENAME=".jpg";
private static String FILENAME = ".jpg";
@Autowired
public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper,PackageMapper packageMapper,ProductMapper productMapper) {
public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper, PackageMapper packageMapper, ProductMapper productMapper) {
SchoolManagementController.schoolMapper = schoolMapper;
SchoolManagementController.schoolPackageMapper = schoolPackageMapper;
SchoolManagementController.packageMapper = packageMapper;
......@@ -90,9 +91,9 @@ public class SchoolManagementController extends BaseController {
}
@Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertSchool( School school, @RequestParam("chosePages") String chosePages,
@RequestParam(value = "startDateStr", required = false) String startDateStr,
@RequestParam(value = "endDateStr", required = false) String endDateStr) {
public ResponseData<String> insertSchool(School school, @RequestParam("chosePages") String chosePages,
@RequestParam(value = "startDateStr", required = false) String startDateStr,
@RequestParam(value = "endDateStr", required = false) String endDateStr) {
try {
if (StringUtils.isNotBlank(startDateStr)) {
school.setStartDate(DateUtils.parseDate(startDateStr));
......@@ -100,45 +101,44 @@ public class SchoolManagementController extends BaseController {
if (StringUtils.isNotBlank(endDateStr)) {
school.setEndDate(DateUtils.parseDate(endDateStr));
}
}catch(Exception e){
} catch (Exception e) {
return ResponseData.error("日期格式转换错误");
}
Integer insert = schoolMapper.insert(school);
//插入中间表
if (StringUtils.isNotBlank(chosePages)){
if (StringUtils.isNotBlank(chosePages)) {
String[] split = chosePages.split(",");
if (split.length<=0) {
if (split.length <= 0) {
return ResponseData.success("添加成功!");
}
for (String s : split) {
SchoolPackage schoolPackage = new SchoolPackage();
schoolPackage.setSchoolId( String.valueOf(school.getId()));
schoolPackage.setSchoolId(String.valueOf(school.getId()));
schoolPackage.setPackageId(s);
schoolPackageMapper.insert(schoolPackage);
}
}
if (insert==1){
if (insert == 1) {
EntityWrapper<School> schoolwrapper = new EntityWrapper<>();
schoolwrapper.eq("id",school.getId());
String backgroundpath= "/"+DEFAULTPATH+ school.getId()+FILENAME;
schoolMapper.updateForSet("service_qrcode ='"+backgroundpath+"'",schoolwrapper);
log.info("学校信息新增完毕,id: {}",school.getId());
schoolwrapper.eq("id", school.getId());
String backgroundpath = "/" + DEFAULTPATH + school.getId() + FILENAME;
schoolMapper.updateForSet("service_qrcode ='" + backgroundpath + "'", schoolwrapper);
log.info("学校信息新增完毕,id: {}", school.getId());
return ResponseData.success("添加成功!");
}
return ResponseData.error("添加失败!");
}
@Permission(menuname = "删除學校信息", value = "hidestatus", method = RequestMethod.POST)
public ResponseData<String> deleteSchool(@RequestParam("id") String id,@RequestParam("status") int status) {
Integer integer = schoolMapper.updateForSet("status=" + status, new EntityWrapper<School>().eq("id", id));
@Permission(menuname = "修改學校是否为老客户", value = "hidestatus", method = RequestMethod.POST)
public ResponseData<String> deleteSchool(@RequestParam("id") String id, @RequestParam("status") int status) {
System.out.println(id);
/*Integer integer = schoolMapper.updateForSet("status=" + status, new EntityWrapper<School>().eq("id", id));
if (integer==1){
return ResponseData.success("修改成功!");
}
return ResponseData.error("修改失败");
}*/
return ResponseData.error("修改失败");
}
/**
......@@ -151,7 +151,7 @@ public class SchoolManagementController extends BaseController {
public ResponseData<String> updateSchool(School school, @RequestParam("chosePages") String chosePages,
@RequestParam(value = "startDateStr", required = false) String startDateStr,
@RequestParam(value = "endDateStr", required = false) String endDateStr) {
try{
try {
if (StringUtils.isNotBlank(startDateStr)) {
school.setStartDate(DateUtils.parseDate(startDateStr));
}
......@@ -160,18 +160,18 @@ public class SchoolManagementController extends BaseController {
}
Wrapper<School> wrapper = new EntityWrapper<>();
wrapper.eq("id",school.getId());
wrapper.eq("id", school.getId());
Map<String, Object> dataMapping = new HashMap<>();
schoolMapper.update(school, wrapper);
// schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
//插入学校与套餐中间表数据
if (StringUtils.isNotBlank(chosePages)){
if (StringUtils.isNotBlank(chosePages)) {
String[] split = chosePages.split(",");
if (split.length<=0) {
if (split.length <= 0) {
return ResponseData.success("修改完毕!");
}
EntityWrapper<SchoolPackage> schoolPackagewrapper = new EntityWrapper<>();
schoolPackagewrapper.eq("school_id",school.getId());
schoolPackagewrapper.eq("school_id", school.getId());
schoolPackageMapper.delete(schoolPackagewrapper);
for (String s : split) {
SchoolPackage schoolPackage = new SchoolPackage();
......@@ -180,7 +180,7 @@ public class SchoolManagementController extends BaseController {
schoolPackageMapper.insert(schoolPackage);
}
}
}catch(Exception e) {
} catch (Exception e) {
log.error("修改学校失败!" + e.getMessage());
}
......@@ -188,7 +188,6 @@ public class SchoolManagementController extends BaseController {
}
/**
*
* @param subName
* @param status
* @param schoolName
......@@ -197,10 +196,10 @@ public class SchoolManagementController extends BaseController {
* @return
*/
@Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST)
public ResponseData<Page<Map<String,Object>>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
@RequestParam("schoolName") String schoolName, @RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize,
@RequestParam("networkName") String networkName) {
public ResponseData<Page<Map<String, Object>>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
@RequestParam("schoolName") String schoolName, @RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize,
@RequestParam("networkName") String networkName) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员"))) {
return ResponseData.error("无数据权限");
......@@ -210,7 +209,7 @@ public class SchoolManagementController extends BaseController {
wrapper.like(StringUtils.isNotBlank(schoolName), "school_name", schoolName, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
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);
//查询县分列表
......@@ -227,41 +226,41 @@ public class SchoolManagementController extends BaseController {
productwrapper.eq("product_state", "0");
List<Map<String, Object>> products = productMapper.selectMaps(productwrapper);
//存放县分下拉列表和单宽学校名称下拉列表
if (!CollectionUtils.isEmpty(maps)){
maps.get(0).put("subNameList",selectMaps);
maps.get(0).put("packageName",packageselectMaps);
maps.get(0).put("products",products);
if (!CollectionUtils.isEmpty(maps)) {
maps.get(0).put("subNameList", selectMaps);
maps.get(0).put("packageName", packageselectMaps);
maps.get(0).put("products", products);
}
page.setRecords(maps);
return ResponseData.success(page, "查询完毕!");
}
@Permission(menuname = "编辑套餐选择回显数据", value = "choosepages", method = RequestMethod.POST)
public ResponseData<Map<String,Object>> editdisplay(@RequestParam("id") String id) {
public ResponseData<Map<String, Object>> editdisplay(@RequestParam("id") String id) {
HashMap<String, Object> hashMap = new HashMap<>();
EntityWrapper<SchoolPackage> schoolPackagewrapper = new EntityWrapper<>();
schoolPackagewrapper.eq("school_id",id);
schoolPackagewrapper.eq("school_id", id);
List<SchoolPackage> schoolPackages = schoolPackageMapper.selectList(schoolPackagewrapper);
ArrayList<String> arrayList = new ArrayList<>();
schoolPackages.forEach(val->{
schoolPackages.forEach(val -> {
arrayList.add(val.getPackageId());
});
hashMap.put("choosepages",arrayList);
hashMap.put("choosepages", arrayList);
return ResponseData.success(hashMap, "查询完毕!");
}
@Permission(menuname = "上传二维码", value = "qrcodeUpload", method = RequestMethod.POST)
public ResponseData<String>xiaotuUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id",required = false) String id) {
String backgroundpath = FilePath.BACKGROUNDIMG.getValue() + "/" + DEFAULTPATH;
public ResponseData<String> xiaotuUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id", required = false) String id) {
String backgroundpath = FilePath.BACKGROUNDIMG.getValue() + "/" + DEFAULTPATH;
File dir = new File(backgroundpath);
if (!dir.exists()) {
dir.mkdirs();
}
if(!StringUtils.endsWithAny(file.getOriginalFilename(), "jpg", "jpeg", "png", "gif")) {
if (!StringUtils.endsWithAny(file.getOriginalFilename(), "jpg", "jpeg", "png", "gif")) {
return ResponseData.error("上传失败,仅支持jpg、jpeg、png");
}
if ( (double)file.getSize()/1048576 > 100) {
if ((double) file.getSize() / 1048576 > 100) {
return ResponseData.error("图片过大,无法上传");
}
School school1 = schoolMapper.selectById(id);
......@@ -273,61 +272,63 @@ public class SchoolManagementController extends BaseController {
os.flush();
Wrapper<School> wrapper = new EntityWrapper<>();
wrapper.eq("id",id);
wrapper.eq("id", id);
School school = schoolMapper.selectById(id);
Map<String, Object> map = new HashMap<>();
map.put("service_qrcode",backgroundpath+school.getId()+FILENAME);
map.put("service_qrcode", backgroundpath + school.getId() + FILENAME);
Integer integer = schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map), wrapper);
if (integer!=1){
if (integer != 1) {
return ResponseData.error("上传失败!");
}
return ResponseData.success("上传成功" );
return ResponseData.success("上传成功");
} catch (Exception e) {
log.error("上传文件失败:" + e.getMessage(), e);
return ResponseData.error("上传失败" + e.getMessage());
} finally {
if (os != null) {
try{
try {
os.close();
}catch(Exception e) {}
} catch (Exception e) {
}
}
}
}
@RequestMapping(name = "获取县分下拉列表", value = "substList", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> substList() {
public ResponseData<List<Map<String, Object>>> substList() {
// ShiroUser user = getShiroUser();
// if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
// return ResponseData.error("无数据权限");
// }
// 查询县分列表
Wrapper<School> wrapperSubName = new EntityWrapper<School>();
wrapperSubName.setSqlSelect("sub_name")
.ne("sub_name", "null")
.groupBy("sub_name");
List<Map<String, Object>> substNameList = schoolMapper.selectMaps(wrapperSubName);
// 查询县分列表
Wrapper<School> wrapperSubName = new EntityWrapper<School>();
wrapperSubName.setSqlSelect("sub_name")
.ne("sub_name", "null")
.groupBy("sub_name");
List<Map<String, Object>> substNameList = schoolMapper.selectMaps(wrapperSubName);
return ResponseData.success(substNameList, "查询完毕!");
}
return ResponseData.success(substNameList, "查询完毕!");
}
@RequestMapping(name = "获取学校下拉列表", value = "schoolList", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> schoolList(@RequestParam("substName") String substName) {
public ResponseData<List<Map<String, Object>>> schoolList(@RequestParam("substName") String substName) {
// ShiroUser user = getShiroUser();
// if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
// return ResponseData.error("无数据权限");
// }
// 查询县分列表
Wrapper<School> wrapper = new EntityWrapper<School>();
wrapper.setSqlSelect("id,school_name")
.eq("sub_name", substName)
.groupBy("school_name");
List<Map<String, Object>> schoolList = schoolMapper.selectMaps(wrapper);
// 查询县分列表
Wrapper<School> wrapper = new EntityWrapper<School>();
wrapper.setSqlSelect("id,school_name")
.eq("sub_name", substName)
.groupBy("school_name");
List<Map<String, Object>> schoolList = schoolMapper.selectMaps(wrapper);
return ResponseData.success(schoolList, "查询完毕!");
}
return ResponseData.success(schoolList, "查询完毕!");
}
/**
* 受理订单
*
......@@ -340,7 +341,7 @@ public class SchoolManagementController extends BaseController {
if (!StringUtils.endsWithAny(file.getOriginalFilename(), "xlsx", "xls")) {
return ResponseData.error("手工上传数据仅支持Excel文件,其他格式不支持!");
}
if ( (double)file.getSize()/1048576 > 100) {
if ((double) file.getSize() / 1048576 > 100) {
return ResponseData.error("文件过大,无法上传");
}
ShiroUser user = getShiroUser();
......@@ -411,28 +412,28 @@ public class SchoolManagementController extends BaseController {
return ResponseData.error("第" + (i + 1) + "行的学校名称不能为空");
}
if (!temp.containsKey("c")) {
listMap.get(i).put("c","");
listMap.get(i).put("c", "");
}
if (!temp.containsKey("d")) {
listMap.get(i).put("d","");
listMap.get(i).put("d", "");
}
if (!temp.containsKey("e")) {
listMap.get(i).put("e","");
listMap.get(i).put("e", "");
}
if (!temp.containsKey("f")) {
listMap.get(i).put("f","");
listMap.get(i).put("f", "");
}
if (!temp.containsKey("g")) {
listMap.get(i).put("g","");
listMap.get(i).put("g", "");
}
if (!temp.containsKey("h")) {
listMap.get(i).put("h","");
listMap.get(i).put("h", "");
}
if (!temp.containsKey("i")) {
listMap.get(i).put("i","");
listMap.get(i).put("i", "");
}
if (!temp.containsKey("j")) {
listMap.get(i).put("j","");
listMap.get(i).put("j", "");
}
}
//检查excel表中是否有重复人员编号
......@@ -440,7 +441,7 @@ public class SchoolManagementController extends BaseController {
Set<String> accountSet = new HashSet<>(size);
for (int i = 0; i < size; i++) {
Map<String, Object> temp = listMap.get(i);
accountSet.add((String) temp.get("a")+temp.get("b"));
accountSet.add((String) temp.get("a") + temp.get("b"));
}
if (accountSet.size() != size) {
return ResponseData.error("文件中有重复的学校,请确认学校不能重复!");
......@@ -452,24 +453,24 @@ public class SchoolManagementController extends BaseController {
int number = 0;
Integer integer = 0;
Map<String,Object> schoolMap = new HashMap<>();
Map<String,Object> productmap = new HashMap<>();
Map<String, Object> schoolMap = new HashMap<>();
Map<String, Object> productmap = new HashMap<>();
for (int i = 1; i < listMap.size(); i++) {
Map<String, Object> map = listMap.get(i);
integer = 0;
schoolMap = schoolMapper.querySchoolMap(map.get("a").toString(),map.get("b").toString());
schoolMap = schoolMapper.querySchoolMap(map.get("a").toString(), map.get("b").toString());
productmap = productMapper.queryProductMaps(map.get("c").toString()).get(0);
map.put("c",productmap.get("productId").toString());
try{
if(schoolMap != null && schoolMap.size() != 0){
map.put("c", productmap.get("productId").toString());
try {
if (schoolMap != null && schoolMap.size() != 0) {
integer = schoolMapper.updateSchoolMap(map);
}else {
} else {
integer = schoolMapper.insertSchoolMap(map);
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
......@@ -482,15 +483,15 @@ public class SchoolManagementController extends BaseController {
error.append("成功更新" + number + "条数据!");
return ResponseData.success(error.toString(), "导入完成");
}
/**
*
* @return
*/
@Permission(menuname = "导出学校列表信息", value = "excelOut", method = RequestMethod.POST)
public void excelOut(@Param("networkName") String networkName,
@Param("status") String status,
@Param("subName") String subName,
@Param("schoolName") String schoolName){
@Param("schoolName") String schoolName) {
Wrapper<School> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(networkName), "network_name", networkName, SqlLike.DEFAULT);
......@@ -499,13 +500,13 @@ public class SchoolManagementController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(status), "status", status);
List<Map<String, Object>> maps = schoolMapper.selectMaps(wrapper);
List<Map<String, Object>> schoolmaps = new ArrayList<>();
Map<String,Object> productMap = new HashMap<>();
for (Map<String,Object> map:maps){
map.put("productUniversity","");
if(null != map.get("bandproductId") && StringUtils.isNotBlank(map.get("bandproductId").toString())){
Map<String, Object> productMap = new HashMap<>();
for (Map<String, Object> map : maps) {
map.put("productUniversity", "");
if (null != map.get("bandproductId") && StringUtils.isNotBlank(map.get("bandproductId").toString())) {
productMap = productMapper.queryProductByIdMap(map.get("bandproductId").toString());
if(productMap != null && productMap.size() != 0){
map.put("productUniversity",productMap.get("productUniversity"));
if (productMap != null && productMap.size() != 0) {
map.put("productUniversity", productMap.get("productUniversity"));
}
}
schoolmaps.add(map);
......@@ -528,8 +529,8 @@ public class SchoolManagementController extends BaseController {
}
@Permission(menuname = "下载学校上传模板", value = "excelMBOut", method = RequestMethod.POST)
public void excelMBOut(){
Map<String,Object> map = new HashMap<>();
public void excelMBOut() {
Map<String, Object> map = new HashMap<>();
map.put("subName", "");
map.put("schoolName", "");
map.put("netId", "");
......@@ -539,7 +540,7 @@ public class SchoolManagementController extends BaseController {
map.put("networkName", "");
map.put("appId", "");
map.put("appKey", "");
List<Map<String, Object>> maps = new ArrayList<Map<String,Object>>();
List<Map<String, Object>> maps = new ArrayList<Map<String, Object>>();
maps.add(map);
ServletOutputStream os = null;
XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.schoolExcel("校园模板"), maps);
......@@ -557,4 +558,22 @@ public class SchoolManagementController extends BaseController {
IOUtils.closeQuite(workbook, os);
}
}
@Permission(menuname = "删除学校信息", value = "deleteSchoolById", method = RequestMethod.POST)
@Transactional
public ResponseData<String> deleteSchool(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "超级管理员"));
if (!hasDataPermission) {
return ResponseData.error("无数据权限!");
}
try {
schoolMapper.deleteById(Integer.parseInt(id));
return ResponseData.success("删除成功");
} catch (Exception e) {
log.error("删除学校失败!" + e.getMessage(), e);
return ResponseData.success("删除失败");
}
}
}
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