Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupCategory.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -10,7 +12,7 @@ public class VipGroupCategory {
 	/**  */
 	private Integer id;
 	
-	/** 名称 */
+	@ApiModelProperty(value = "名称",required = false)
 	private String name;
 	
 	/**  */
@@ -22,10 +24,10 @@ public class VipGroupCategory {
 	/**  */
 	private java.util.Date updateTime;
 	
-	/** 单节课时 */
+	@ApiModelProperty(value = "单节课时",required = false)
 	private Integer singleClassMinutes;
 	
-	/** 学生数 */
+	@ApiModelProperty(value = "学生数",required = false)
 	private Integer studentNum;
 	
 	public void setId(Integer id){

mec-web/src/main/java/com/ym/mec/web/controller/system/HotWordLabelManageController.java → mec-web/src/main/java/com/ym/mec/web/controller/HotWordLabelManageController.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.controller.system;
+package com.ym.mec.web.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

mec-web/src/main/java/com/ym/mec/web/controller/system/StudentManageController.java → mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.controller.system;
+package com.ym.mec.web.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupCategoryController.java

@@ -0,0 +1,70 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.VipGroupCategory;
+import com.ym.mec.biz.service.VipGroupCategoryService;
+import com.ym.mec.common.controller.BaseController;
+
+@Api(tags = "vip课类别")
+@RequestMapping("VipGroupCategory")
+@RestController
+public class VipGroupCategoryController extends BaseController {
+
+	@Autowired
+	private VipGroupCategoryService vipGroupCategoryService;
+
+	@ApiOperation("单查询")
+	@GetMapping(value = "/query", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object query(int id) {
+		return succeed(vipGroupCategoryService.get(id));
+	}
+
+	@ApiOperation("全查询")
+	@GetMapping(value = "/queryAll", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object queryAll() {
+		return succeed(vipGroupCategoryService.findAll(null));
+	}
+
+	@ApiOperation("新增")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object add(VipGroupCategory vipGroupCategory) {
+		Date date = new Date();
+		vipGroupCategory.setCreateTime(date);
+		vipGroupCategory.setUpdateTime(date);
+		vipGroupCategory.setDelFlag("0");
+		vipGroupCategoryService.insert(vipGroupCategory);
+		return succeed();
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object update(VipGroupCategory vipGroupCategory) {
+		Date date = new Date();
+		vipGroupCategory.setUpdateTime(date);
+		vipGroupCategoryService.update(vipGroupCategory);
+		return succeed();
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object delete(int id) {
+		VipGroupCategory vipGroupCategory = vipGroupCategoryService.get(id);
+		Date date = new Date();
+		vipGroupCategory.setUpdateTime(date);
+		vipGroupCategory.setDelFlag("1");
+		vipGroupCategoryService.update(vipGroupCategory);
+		return succeed();
+	}
+
+}