Skip to content

G
gdtel-gztel-school-center
Commit 0089f27e by 吴学德
Options

学校配置功能

parent 6c519743
Showing with 138 additions and 40 deletions
service-manager/src/main/java/com/winsun/config/WebMvcConfigurer.java 0 → 100644
package com.winsun.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
/**
* @Author xuede
* @Date 2020/2/19 12:31
* @Version 1.0
*/
@Configuration
public class WebMvcConfigurer extends WebMvcConfigurerAdapter {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
//和页面有关的静态目录都放在项目的static目录下
registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
//上传的图片在D盘下的OTA目录下，访问路径如：http://localhost:8080/xxx.jpg
}
}
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
...@@ -9,15 +9,18 @@ import com.winsun.auth.core.annotion.Permission; ...@@ -9,15 +9,18 @@ import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
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.Product;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.bean.SchoolPackage; import com.winsun.bean.SchoolPackage;
import com.winsun.mapper.PackageMapper; import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.ProductMapper;
import com.winsun.mapper.SchoolMapper; import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SchoolPackageMapper; import com.winsun.mapper.SchoolPackageMapper;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
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.RequestParam;
...@@ -45,30 +48,55 @@ public class SchoolManagementController extends BaseController { ...@@ -45,30 +48,55 @@ public class SchoolManagementController extends BaseController {
private static PackageMapper packageMapper; private static PackageMapper packageMapper;
private static ProductMapper productMapper;
@Autowired @Autowired
public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper,PackageMapper packageMapper) { public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper,PackageMapper packageMapper,ProductMapper productMapper) {
SchoolManagementController.schoolMapper = schoolMapper; SchoolManagementController.schoolMapper = schoolMapper;
SchoolManagementController.schoolPackageMapper = schoolPackageMapper; SchoolManagementController.schoolPackageMapper = schoolPackageMapper;
SchoolManagementController.packageMapper = packageMapper; SchoolManagementController.packageMapper = packageMapper;
SchoolManagementController.productMapper = productMapper;
} }
@Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST) @Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertSchool(@RequestParam("school") String school, @RequestParam("packages") String packages) { public ResponseData<String> insertSchool(@RequestParam("subName") String subName,@RequestParam("schoolName") String schoolName,@RequestParam("netId") String netId,
ShiroUser user = getShiroUser(); @RequestParam("lzgh") String lzgh,@RequestParam("bandproductId") String bandproductId,@RequestParam("netPhone") String netPhone,@RequestParam("isShowband") String isShowband,
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { @RequestParam("isShowrh") String isShowrh,@RequestParam("isRecv") String isRecv,@RequestParam("chosePages") String chosePages) {
return ResponseData.error("无数据权限");
School school = new School();
school.setBandproductId(bandproductId);
if (StringUtils.isNotBlank(isRecv)){
school.setIsRecv(Integer.valueOf(isRecv));
}
school.setNetId(netId);
school.setLzgh(lzgh);
school.setSchoolName(schoolName);
school.setSubName(subName);
school.setIsShowband(isShowband);
school.setIsShowrh(isShowrh);
if (StringUtils.isNotBlank(netPhone)){
school.setNetPhone(Integer.valueOf(netPhone));
} }
School school1 = JSON.parseObject(school, School.class); Integer insert = schoolMapper.insert(school);
schoolMapper.insert(school1);
String[] split = packages.split(","); //插入中间表
//中间表 if (StringUtils.isNotBlank(chosePages)){
SchoolPackage schoolPackage = new SchoolPackage(); String[] split = chosePages.split(",");
schoolPackage.setSchoolId(String.valueOf(school1.getId())); if (split.length<=0) {
for (String packageId : split) { return ResponseData.success("添加成功！");
schoolPackage.setPackageId(packageId); }
schoolPackageMapper.insert(schoolPackage); for (String s : split) {
SchoolPackage schoolPackage = new SchoolPackage();
schoolPackage.setSchoolId( String.valueOf(school.getId()));
schoolPackage.setPackageId(s);
schoolPackageMapper.insert(schoolPackage);
}
} }
return ResponseData.success("添加完毕！"); if (insert==1){
return ResponseData.success("添加成功！");
}
return ResponseData.error("添加失败！");
} }
@Permission(menuname = "删除學校信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除學校信息", value = "delete", method = RequestMethod.POST)
...@@ -83,21 +111,54 @@ public class SchoolManagementController extends BaseController { ...@@ -83,21 +111,54 @@ public class SchoolManagementController extends BaseController {
return ResponseData.success("删除完毕！"); return ResponseData.success("删除完毕！");
} }
@Permission(menuname = "修改學校信息", value = "update", method = RequestMethod.POST) /**
public ResponseData<String> updateSchool(@RequestParam("school") String school) { *@param id
ShiroUser user = getShiroUser(); * @param subName 县分
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { * @param schoolName 学校
return ResponseData.error("无数据权限"); * @param netId 网点id
} * @param lzgh 揽装工号
School school1 = JSON.parseObject(school, School.class); * @param bandproductId 单宽id
Wrapper wrapper = new EntityWrapper<>(); * @param netPhone 购机
wrapper.eq("id", school1.getId()); * @param isShowband 显示宽带
/** * @param isShowrh 融合
* 待定............................ * @param isRecv 收到电信卡
*/ * @param chosePages 套餐id
* @return
*/
@Permission(menuname = "修改学校信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateSchool(@RequestParam("id") String id,@RequestParam("subName") String subName,@RequestParam("schoolName") String schoolName,@RequestParam("netId") String netId,
@RequestParam("lzgh") String lzgh,@RequestParam("bandproductId") String bandproductId,@RequestParam("netPhone") String netPhone,@RequestParam("isShowband") String isShowband,
@RequestParam("isShowrh") String isShowrh,@RequestParam("isRecv") String isRecv,@RequestParam("chosePages") String chosePages) {
Wrapper<School> wrapper = new EntityWrapper<>();
wrapper.eq("id",id);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("school_name", ""); dataMapping.put("sub_name", subName);
dataMapping.put("school_name", schoolName);
dataMapping.put("lzgh", lzgh);
dataMapping.put("net_id", netId);
dataMapping.put("is_recv", isRecv);
dataMapping.put("net_phone", netPhone);
dataMapping.put("bandproduct_id", bandproductId);
dataMapping.put("is_showband", isShowband);
dataMapping.put("is_showrh", isShowrh);
schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if (StringUtils.isNotBlank(chosePages)){
String[] split = chosePages.split(",");
if (split.length<=0) {
return ResponseData.success("修改完毕！");
}
EntityWrapper<SchoolPackage> schoolPackagewrapper = new EntityWrapper<>();
schoolPackagewrapper.eq("school_id",id);
schoolPackageMapper.delete(schoolPackagewrapper);
for (String s : split) {
SchoolPackage schoolPackage = new SchoolPackage();
schoolPackage.setSchoolId(id);
schoolPackage.setPackageId(s);
schoolPackageMapper.insert(schoolPackage);
}
}
return ResponseData.success("修改完毕！"); return ResponseData.success("修改完毕！");
} }
...@@ -106,14 +167,13 @@ public class SchoolManagementController extends BaseController { ...@@ -106,14 +167,13 @@ public class SchoolManagementController extends BaseController {
* @param subName * @param subName
* @param status * @param status
* @param schoolName * @param schoolName
* @param netType
* @param pageIndex * @param pageIndex
* @param pageSize * @param pageSize
* @return * @return
*/ */
@Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST) @Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST)
public ResponseData<Page<Map<String,Object>>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status, public ResponseData<Page<Map<String,Object>>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
@RequestParam("schoolName") String schoolName, @RequestParam("netType") String netType, @RequestParam(name = "pageNo", required = false) int pageIndex, @RequestParam("schoolName") String schoolName, @RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) { @RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
...@@ -123,25 +183,41 @@ public class SchoolManagementController extends BaseController { ...@@ -123,25 +183,41 @@ public class SchoolManagementController extends BaseController {
wrapper.like(StringUtils.isNotBlank(schoolName), "school_name", schoolName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(schoolName), "school_name", schoolName, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName); wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
wrapper.eq(StringUtils.isNotBlank(status), "status", status); wrapper.eq(StringUtils.isNotBlank(status), "status", status);
wrapper.eq(StringUtils.isNotBlank(netType), "net_type", netType);
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, name").groupBy("name"); packagewrapper.setSqlSelect("id,package_name as packageName");
List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper); List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper);
maps.forEach(val->{
val.put("subNameList",selectMaps); Wrapper<Product> productwrapper = new EntityWrapper();
val.put("packageName",packageselectMaps); productwrapper.setSqlSelect("product_id as productId,product_university as ProductUniversity");
}); 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);
}
page.setRecords(maps); page.setRecords(maps);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询完毕！");
} }
// @Permission(menuname = "编辑套餐选择回显数据", value = "findByList", method = RequestMethod.POST) @Permission(menuname = "编辑套餐选择回显数据", value = "choosepages", method = RequestMethod.POST)
// public ResponseData<Page<Map<String,Object>>> packageOne(@RequestParam("subName") String subName) { public ResponseData<Map<String,Object>> editdisplay(@RequestParam("id") String id) {
// return ResponseData.success(page, "查询完毕！"); HashMap<String, Object> hashMap = new HashMap<>();
// } EntityWrapper<SchoolPackage> schoolPackagewrapper = new EntityWrapper<>();
schoolPackagewrapper.eq("school_id",id);
List<SchoolPackage> schoolPackages = schoolPackageMapper.selectList(schoolPackagewrapper);
ArrayList<String> arrayList = new ArrayList<>();
schoolPackages.forEach(val->{
arrayList.add(val.getPackageId());
});
hashMap.put("choosepages",arrayList);
return ResponseData.success(hashMap, "查询完毕！");
}
} }
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