Skip to content

G
gdtel-gztel-school-center
Commit 7975a0b8 by 吴学德
Options

Merge remote-tracking branch 'origin/master'

parents 53b77a9d 7166ba0a
Showing with 399 additions and 16 deletions
common/src/main/java/com/winsun/bean/Package.java
...@@ -2,6 +2,7 @@ package com.winsun.bean; ...@@ -2,6 +2,7 @@ package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -16,7 +17,7 @@ public class Package implements Serializable { ...@@ -16,7 +17,7 @@ public class Package implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId @TableId(value = "id", type = IdType.AUTO)
private int id; private int id;
......
common/src/main/java/com/winsun/bean/Partner.java
...@@ -3,6 +3,7 @@ package com.winsun.bean; ...@@ -3,6 +3,7 @@ package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -17,7 +18,7 @@ public class Partner implements Serializable { ...@@ -17,7 +18,7 @@ public class Partner implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId @TableId(value = "id", type = IdType.AUTO)
private String id; private String id;
......
common/src/main/java/com/winsun/bean/Product.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 宽带
*/
@Data
@TableName("product_manage")
public class Product implements Serializable {
/**
* 主键
*/
@TableId(value = "productId", type = IdType.AUTO)
private int productId;
/**
* 宽带标题
*/
private String productTitle;
/**
* 创建人
*/
private String productCreater;
/**
* 最后更新时间
*/
private Date productLastUpdateTime;
/**
* 创建时间
*/
private Date productCreateTime;
/**
* 区域
*/
private String productRegion;
/**
*
*/
private String productIntroductionPic1;
/**
* 套餐及资费
*/
private String productMealPrice;
/**
* 资费介绍
*/
private String productSetMealIntroduction;
/**
* 了解产品
*/
private String productIntroduction;
/**
* 状态0正常，1删除
*/
private String productState = "0";
/**
* 适用学校
*/
private String productUniversity;
/**
* 标识
*/
private String identifying;
/**
* 预留字段2
*/
private String productRf2;
/**
* 小白卡套餐id
*/
private String productSchoolAbbreviated;
/**
* 资费
*/
private String productPrice;
private String productMeal;
private String productRate;
private String productIntroductionPic2;
private String productIntroductionPic3;
private String productIntroductionPic4;
private String productIntroductionPic5;
}
common/src/main/java/com/winsun/bean/UniversityInfo.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
*大学宽带管理
*/
@Data
@TableName("university_info")
public class UniversityInfo implements Serializable {
/**
* 主键
*/
@TableId(value = "universityId", type = IdType.AUTO)
private int universityId;
/**
* 学校名称
*/
private String universityName;
/**
*所在区域
*/
private String universityRegion;
/**
*外线方式
*/
private String universityExteriorLines;
/**
*揽装工号
*/
private String universityPackageNumber;
/**
*创建人
*/
private String universityCreater;
/**
*创建时间
*/
private Date universityCreateTime;
/**
*最后更新时间
*/
private Date universityLastUpdateTime;
/**
*装机地址
*/
private String universityInstalledAddress;
/**
*允许上网终端类型
*/
private String universityTerminalType;
/**
*用户类别
*/
private String universityUserCategory;
/**
*用户类型
*/
private String universityUserType;
/**
*月租类型
*/
private String universityMonthlyRentType;
/**
*'计费属性'
*/
private String universityChargingAttribute;
/**
*最大在线数
*/
private String universityOnlineNumber;
/**
*一人一号多终端:0否 1是
*/
private String universityOneManTerminal;
/**
*是否FTTH+HUB:0否 1是
*/
private String universityIsFtthHub;
/**
*
*/
private String universityInstalledAddressID;
/**
*
*/
private String universityContactPhone;
/**
*
*/
private String universityChargeMode;
/**
*
*/
private String universityDomainName;
/**
*对用户显示的融合套餐
*/
private String rhPackage;
/**
*融合资费
*/
private String expenses;
/**
*标识
*/
private String identifying;
/**
*融合办理，短信通知的提速的速率
*/
private String speed;
/**
*公众号的名字
*/
private String publicNumber;
}
common/src/main/java/com/winsun/mapper/ProductMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Package;
import com.winsun.bean.Product;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface ProductMapper extends BaseMapper<Product> {
}
common/src/main/java/com/winsun/mapper/UniversityInfoMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Package;
import com.winsun.bean.UniversityInfo;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface UniversityInfoMapper extends BaseMapper<UniversityInfo> {
}
service-manager/src/main/java/com/winsun/controller/PartnerController.java
...@@ -30,44 +30,44 @@ import java.util.Map; ...@@ -30,44 +30,44 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/school/salesperson") @RequestMapping("/school/partner")
public class PartnerController extends BaseController { public class PartnerController extends BaseController {
private static PartnerMapper salespersonMapper; private static PartnerMapper partnerMapper;
@Autowired @Autowired
public PartnerController(PartnerMapper salespersonMapper) { public PartnerController(PartnerMapper partnerMapper) {
PartnerController.salespersonMapper = salespersonMapper; PartnerController.partnerMapper = partnerMapper;
} }
@Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST) @Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertSalesperson(@RequestParam("salesperson") String salesperson) { public ResponseData<String> insertPartner(@RequestParam("partner") String partner) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Partner sale = JSON.parseObject(salesperson, Partner.class); Partner sale = JSON.parseObject(partner, Partner.class);
salespersonMapper.insert(sale); partnerMapper.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(@RequestParam("id") String id) { public ResponseData<String> deletePartner(@RequestParam("id") String id) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
salespersonMapper.deleteById(id); partnerMapper.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(@RequestParam("salesperson") String salesperson) { public ResponseData<String> updatePartner(@RequestParam("partner") String partner) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Partner sale = JSON.parseObject(salesperson, Partner.class); Partner sale = JSON.parseObject(partner, Partner.class);
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", sale.getId()); wrapper.eq("id", sale.getId());
/** /**
...@@ -75,12 +75,12 @@ public class PartnerController extends BaseController { ...@@ -75,12 +75,12 @@ public class PartnerController extends BaseController {
*/ */
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("phoneNum", ""); dataMapping.put("phoneNum", "");
salespersonMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); partnerMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改完毕！");
} }
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Partner>> listSalesperson(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status, public ResponseData<Page<Partner>> listPartner(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status,
@RequestParam("school") String school, @RequestParam("account") String account, @RequestParam("school") String school, @RequestParam("account") String account,
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area, @RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
@RequestParam("grade") String grade, @RequestParam("grade") String grade,
...@@ -99,7 +99,7 @@ public class PartnerController extends BaseController { ...@@ -99,7 +99,7 @@ public class PartnerController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(area), "area", area); wrapper.eq(StringUtils.isNotBlank(area), "area", area);
wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender); wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender);
Page<Partner> page = new Page<>(pageIndex, pageSize); Page<Partner> page = new Page<>(pageIndex, pageSize);
List<Partner> salespeople = salespersonMapper.selectPage(page, wrapper); List<Partner> salespeople = partnerMapper.selectPage(page, wrapper);
page.setRecords(salespeople); page.setRecords(salespeople);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询完毕！");
} }
......
service-manager/src/main/java/com/winsun/controller/ProductController.java 0 → 100644
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.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.Product;
import com.winsun.mapper.ProductMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
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 java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 宽带管理
* @Author: chancy
* @Date: 2020/2/12 17:26
*/
@Slf4j
@RestController
@RequestMapping("/school/product")
public class ProductController extends BaseController {
private static ProductMapper productMapper;
@Autowired
public ProductController(ProductMapper productMapper) {
ProductController.productMapper = productMapper;
}
@Permission(menuname = "添加宽带信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertProduct(@RequestParam("product") String product) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Product pro = JSON.parseObject(product, Product.class);
Date date = new Date();
Timestamp timestamp = new Timestamp(date.getTime());
//状态问题
pro.setProductCreateTime(timestamp);
pro.setProductLastUpdateTime(timestamp);
pro.setProductCreater(user.getName());
productMapper.insert(pro);
return ResponseData.success("添加完毕！");
}
@Permission(menuname = "删除宽带信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deleteProduct(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Date date = new Date();
Timestamp timestamp = new Timestamp(date.getTime());
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("product_id", id);
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("product_last_update_time", timestamp);
dataMapping.put("product_state","1");
productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("删除完毕！");
}
@Permission(menuname = "修改宽带信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateProduct(@RequestParam("product") String product) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Product sale = JSON.parseObject(product, Product.class);
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("product_id", sale.getProductId());
/**
* 待定............................
*/
Date date = new Date();
Timestamp timestamp = new Timestamp(date.getTime());
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("product_last_update_time", timestamp);
productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！");
}
@Permission(menuname = "查询宽带信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Product>> listProduct(@RequestParam("productUniversity") String productUniversity, @RequestParam("productRegion") String productRegion,
@RequestParam("productTitle") String productTitle, @RequestParam("productState") String productState,
@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<Product> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(productUniversity), "product_university", productUniversity, SqlLike.LEFT);
wrapper.like(StringUtils.isNotBlank(productTitle), "product_title", productTitle, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(productRegion), "product_region", productRegion);
wrapper.eq(StringUtils.isNotBlank(productState), "product_state", productState);
Page<Product> page = new Page<>(pageIndex, pageSize);
List<Product> products = productMapper.selectPage(page, wrapper);
page.setRecords(products);
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