Skip to content

G
gdtel-gztel-school-center
Commit 29b0f575 by 吴学德
Options

Merge remote-tracking branch 'origin/master'

parents f07a5edf 8cd5dba6
Showing with 34 additions and 28 deletions
common/src/main/java/com/winsun/bean/Product.java
...@@ -18,7 +18,7 @@ public class Product implements Serializable { ...@@ -18,7 +18,7 @@ public class Product implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId(value = "productId", type = IdType.AUTO) @TableId(value = "product_id", type = IdType.AUTO)
private int productId; private int productId;
...@@ -97,7 +97,13 @@ public class Product implements Serializable { ...@@ -97,7 +97,13 @@ public class Product implements Serializable {
*/ */
private String productPrice; private String productPrice;
/**
* 宽带速率
*/
private String productMeal; private String productMeal;
/**
* 包年包月情况
*/
private String productRate; private String productRate;
private String productIntroductionPic2; private String productIntroductionPic2;
private String productIntroductionPic3; private String productIntroductionPic3;
......
common/src/main/java/com/winsun/bean/UniversityInfo.java
...@@ -18,7 +18,7 @@ public class UniversityInfo implements Serializable { ...@@ -18,7 +18,7 @@ public class UniversityInfo implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId(value = "universityId", type = IdType.AUTO) @TableId(value = "university_id", type = IdType.AUTO)
private int universityId; private int universityId;
......
service-manager/src/main/java/com/winsun/controller/ProductController.java
...@@ -15,10 +15,7 @@ import com.winsun.utils.MyBatisPlusUpdateUtils; ...@@ -15,10 +15,7 @@ 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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
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.sql.Timestamp;
import java.util.Date; import java.util.Date;
...@@ -28,12 +25,13 @@ import java.util.Map; ...@@ -28,12 +25,13 @@ 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/product") @RequestMapping("/product")
public class ProductController extends BaseController { public class ProductController extends BaseController {
private static ProductMapper productMapper; private static ProductMapper productMapper;
...@@ -45,6 +43,7 @@ public class ProductController extends BaseController { ...@@ -45,6 +43,7 @@ public class ProductController extends BaseController {
/** /**
* 宽带添加 * 宽带添加
*
* @param product 添加对象json字符串 * @param product 添加对象json字符串
* @return * @return
*/ */
...@@ -70,8 +69,8 @@ public class ProductController extends BaseController { ...@@ -70,8 +69,8 @@ public class ProductController extends BaseController {
* @param id 需要删除的id * @param id 需要删除的id
* @return * @return
*/ */
@Permission(menuname = "删除宽带信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除宽带信息", value = "delete/{id}", method = RequestMethod.POST)
public ResponseData<String> deleteProduct(@RequestParam("id") String id) { public ResponseData<String> deleteProduct(@PathVariable("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("无数据权限");
...@@ -82,7 +81,7 @@ public class ProductController extends BaseController { ...@@ -82,7 +81,7 @@ public class ProductController extends BaseController {
wrapper.eq("product_id", id); wrapper.eq("product_id", id);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("product_last_update_time", timestamp); dataMapping.put("product_last_update_time", timestamp);
dataMapping.put("product_state","1"); dataMapping.put("product_state", "1");
productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("删除完毕！"); return ResponseData.success("删除完毕！");
} }
...@@ -99,45 +98,46 @@ public class ProductController extends BaseController { ...@@ -99,45 +98,46 @@ public class ProductController extends BaseController {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Product sale = JSON.parseObject(product, Product.class); Product pro = JSON.parseObject(product, Product.class);
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("product_id", sale.getProductId()); wrapper.eq("product_id", pro.getProductId());
/**
* 待定............................
*/
Date date = new Date(); Date date = new Date();
Timestamp timestamp = new Timestamp(date.getTime()); Timestamp timestamp = new Timestamp(date.getTime());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("product_last_update_time", timestamp); dataMapping.put("product_last_update_time", timestamp);
dataMapping.put("product_introduction", pro.getProductIntroduction());
dataMapping.put("product_set_meal_introduction", pro.getProductSetMealIntroduction());
dataMapping.put("product_meal_price", pro.getProductMealPrice());
dataMapping.put("product_meal", pro.getProductMeal());
dataMapping.put("product_title", pro.getProductTitle());
dataMapping.put("product_university", pro.getProductUniversity());
dataMapping.put("product_price", pro.getProductPrice());
dataMapping.put("product_region", pro.getProductRegion());
dataMapping.put("product_rate", pro.getProductRate());
productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改完毕！");
} }
/** /**
*寬帶查詢展示 * 寬帶查詢展示
* *
* @param productUniversity 适用学校 * @param productUniversity 适用学校
* @param productRegion 区域 * @param productRegion 区域
* @param productTitle 宽带标题
* @param productState 宽带狀態
* @param pageIndex
* @param pageSize * @param pageSize
* @return * @return
*/ */
@Permission(menuname = "查询宽带信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询宽带信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Product>> listProduct(@RequestParam("productUniversity") String productUniversity, @RequestParam("productRegion") String productRegion, public ResponseData<Page<Product>> listProduct(@RequestParam(name = "productUniversity", required = false) String productUniversity, @RequestParam(name = "productRegion", required = false) String productRegion,
@RequestParam("productTitle") String productTitle, @RequestParam("productState") String productState, @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
@RequestParam(name = "pageIndex", required = false) int pageIndex, @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, "超级管理员"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Wrapper<Product> wrapper = new EntityWrapper(); Wrapper<Product> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(productUniversity), "product_university", productUniversity, SqlLike.LEFT); wrapper.like(StringUtils.isNotBlank(productUniversity), "product_university", productUniversity, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(productTitle), "product_title", productTitle, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(productRegion), "product_region", productRegion, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(productRegion), "product_region", productRegion); wrapper.eq("product_state", "0");
wrapper.eq(StringUtils.isNotBlank(productState), "product_state", productState); Page<Product> page = new Page<>(pageNo, pageSize);
Page<Product> page = new Page<>(pageIndex, pageSize);
List<Product> products = productMapper.selectPage(page, wrapper); List<Product> products = productMapper.selectPage(page, wrapper);
page.setRecords(products); page.setRecords(products);
return ResponseData.success(page, "查询完毕！"); 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