update

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

@@ -0,0 +1,68 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.entity.Goods;
+import com.ym.mec.web.dal.entity.Subject;
+import com.ym.mec.web.dal.page.GoodsQueryInfo;
+import com.ym.mec.web.dal.page.SubjectQueryInfo;
+import com.ym.mec.web.service.GoodsService;
+import com.ym.mec.web.service.SubjectService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("goods")
+@Api(tags = "商品(教材、辅件)服务")
+@RestController
+public class GoodsController extends BaseController {
+
+    @Autowired
+    private GoodsService goodsService;
+
+    @ApiOperation(value = "新增商品(教材、辅件)")
+    @PostMapping("/add")
+    public Object add(Goods goods){
+        Date date = new Date();
+        goods.setCreateTime(date);
+        goods.setUpdateTime(date);
+        goodsService.insert(goods);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除商品(教材、辅件)")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
+        goodsService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改商品(教材、辅件)")
+    @PutMapping("/update")
+    public Object update(Goods goods){
+        goods.setUpdateTime(new Date());
+        goodsService.update(goods);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
+        return succeed(goodsService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询商品(教材、辅件)列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(GoodsQueryInfo queryInfo){
+        return succeed(goodsService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "通过科目编号、商品分类 查询商品(教材、辅件)列表")
+    @PostMapping("/queryGoodsBySubId")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "subjectId", value = "科目编号", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "goodsCategoryId", value = "商品分类", required = true, dataType = "Integer")})
+    public Object findGoodsBySubId(Integer subjectId,Integer goodsCategoryId){
+        return succeed(goodsService.findGoodsBySubId(subjectId,goodsCategoryId));
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.web.dal.entity.Organization;
 import com.ym.mec.web.dal.page.OrganizationQueryInfo;
 import com.ym.mec.web.service.OrganizationService;

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

@@ -0,0 +1,64 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.entity.Subject;
+import com.ym.mec.web.dal.page.SubjectQueryInfo;
+import com.ym.mec.web.service.SubjectService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("subject")
+@Api(tags = "科目服务")
+@RestController
+public class SubjectController extends BaseController {
+
+    @Autowired
+    private SubjectService subjectService;
+
+    @ApiOperation(value = "新增科目")
+    @PostMapping("/add")
+    public Object add(Subject subject){
+        Date date = new Date();
+        subject.setCreateTime(date);
+        subject.setUpdateTime(date);
+        subjectService.insert(subject);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除科目")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id){
+        subjectService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改科目")
+    @PutMapping("/update")
+    public Object update(Subject subject){
+        subject.setUpdateTime(new Date());
+        subjectService.update(subject);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据科目编号查询科目")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id){
+        return succeed(subjectService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询科目列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(SubjectQueryInfo queryInfo){
+        return succeed(subjectService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "通过乐团编号查询科目列表")
+    @PostMapping("/querySubByMusicGroupId")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
+    public Object findSubByMusicGroupId(Integer musicGroupId){
+        return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
+    }
+}

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

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 
-@RequestMapping("school")
+@RequestMapping("teacher")
 @Api(tags = "教师服务")
 @RestController
 public class TeacherController extends BaseController {

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsDao.java

@@ -2,8 +2,16 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.Goods;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface GoodsDao extends BaseDAO<Integer, Goods> {
 
-	
+    /**
+     * 通过科目编号查询商品(教材、辅件)列表
+     * @param subjectId
+     * @return
+     */
+    List<Goods> findGoodsBySubId(@Param("subjectId") Integer subjectId, @Param("goodsCategoryId") Integer goodsCategoryId);
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/SubjectDao.java

@@ -3,7 +3,14 @@ package com.ym.mec.web.dal.dao;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.Subject;
 
+import java.util.List;
+
 public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
-	
+    /**
+     * 通过乐团编号查询科目列表
+     * @param musicGroupId
+     * @return
+     */
+    List<Subject> findSubByMusicGroupId(Integer musicGroupId);
 }

mec-web/src/main/java/com/ym/mec/web/dal/entity/Subject.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,12 +12,15 @@ public class Subject {
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "科目名称",required = false)
 	private String name;
 	
 	/**  */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private String code;
 	
 	/**  */
+	@ApiModelProperty(value = "父级编号",required = false)
 	private Integer parentSubjectId;
 	
 	/**  */
@@ -26,6 +30,7 @@ public class Subject {
 	private java.util.Date updateTime;
 	
 	/**  */
+	@ApiModelProperty(value = "是否删除1是，0否",required = false)
 	private String delFlag;
 	
 	public void setId(Integer id){

mec-web/src/main/java/com/ym/mec/web/dal/enums/YesOrNoEnum.java

@@ -0,0 +1,33 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
+    YES(1,"是"),
+    NO(0,"否");
+
+    private Integer code;
+    private String msg;
+
+    YesOrNoEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/page/GoodsQueryInfo.java

@@ -0,0 +1,55 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class GoodsQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "商品分类",required = false)
+    private Integer goodsCategoryId;
+
+    //是否是新品（1，是  0，否）
+    @ApiModelProperty(value = "是否是新品（1，是  0，否）",required = false)
+    private YesOrNoEnum isNew;
+
+    //是否置顶（1，置顶   0，不置顶）
+    @ApiModelProperty(value = "是否置顶（1，置顶   0，不置顶）",required = false)
+    private YesOrNoEnum isTop;
+
+    //状态（1，上架  0，下架）
+    @ApiModelProperty(value = "状态（1，上架  0，下架）",required = false)
+    private YesOrNoEnum status;
+
+    public Integer getGoodsCategoryId() {
+        return goodsCategoryId;
+    }
+
+    public void setGoodsCategoryId(Integer goodsCategoryId) {
+        this.goodsCategoryId = goodsCategoryId;
+    }
+
+    public YesOrNoEnum getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(YesOrNoEnum isNew) {
+        this.isNew = isNew;
+    }
+
+    public YesOrNoEnum getIsTop() {
+        return isTop;
+    }
+
+    public void setIsTop(YesOrNoEnum isTop) {
+        this.isTop = isTop;
+    }
+
+    public YesOrNoEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(YesOrNoEnum status) {
+        this.status = status;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/page/SubjectQueryInfo.java

@@ -0,0 +1,6 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class SubjectQueryInfo extends QueryInfo {
+}

mec-web/src/main/java/com/ym/mec/web/service/GoodsService.java

@@ -3,6 +3,14 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Goods;
 
+import java.util.List;
+
 public interface GoodsService extends BaseService<Integer, Goods> {
 
+    /**
+     * 通过科目编号查询商品(教材、辅件)列表
+     * @param subjectId
+     * @return
+     */
+    List<Goods> findGoodsBySubId(Integer subjectId,Integer goodsCategoryId);
 }

mec-web/src/main/java/com/ym/mec/web/service/SubjectService.java

@@ -3,6 +3,14 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Subject;
 
+import java.util.List;
+
 public interface SubjectService extends BaseService<Integer, Subject> {
 
+    /**
+     * 通过乐团编号查询科目列表
+     * @param musicGroupId
+     * @return
+     */
+    List<Subject> findSubByMusicGroupId(Integer musicGroupId);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/GoodsServiceImpl.java

@@ -9,6 +9,8 @@ import com.ym.mec.web.dal.dao.GoodsDao;
 import com.ym.mec.web.dal.entity.Goods;
 import com.ym.mec.web.service.GoodsService;
 
+import java.util.List;
+
 @Service
 public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implements GoodsService {
 	
@@ -19,5 +21,9 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	public BaseDAO<Integer, Goods> getDAO() {
 		return goodsDao;
 	}
-	
+
+	@Override
+	public List<Goods> findGoodsBySubId(Integer subjectId,Integer goodsCategoryId) {
+		return goodsDao.findGoodsBySubId(subjectId,goodsCategoryId);
+	}
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/SubjectServiceImpl.java

@@ -9,6 +9,8 @@ import com.ym.mec.web.dal.dao.SubjectDao;
 import com.ym.mec.web.dal.entity.Subject;
 import com.ym.mec.web.service.SubjectService;
 
+import java.util.List;
+
 @Service
 public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  implements SubjectService {
 	
@@ -19,5 +21,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
 	public BaseDAO<Integer, Subject> getDAO() {
 		return subjectDao;
 	}
-	
+
+	@Override
+	public List<Subject> findSubByMusicGroupId(Integer musicGroupId) {
+		return subjectDao.findSubByMusicGroupId(musicGroupId);
+	}
 }

mec-web/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -133,4 +133,9 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM goods
 	</select>
+
+    <select id="findGoodsBySubId" resultMap="Goods">
+        SELECT g.* FROM subject_goods_mapper sgm LEFT JOIN goods g ON sgm.goods_id_ = g.id_
+        WHERE sgm.subject_id_ =  #{subjectId} AND g.goods_category_id_ = #{goodsCategoryId}
+    </select>
 </mapper>

mec-web/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -76,4 +76,8 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM subject
 	</select>
+
+    <select id="findSubByMusicGroupId" resultMap="Subject">
+        SELECT s.* FROM music_group_subject_plan mgsp LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_ WHERE mgsp.music_group_id_ = #{musicGroupId}
+    </select>
 </mapper>