声部接口修改

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -63,7 +63,7 @@ public class SysMenu {
 
 	/** 逻辑删除标记(0--正常 1--删除) */
 	@ApiModelProperty(value = "逻辑删除标记(0--正常 1--删除)",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	private Integer hid;
 	

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRole.java

@@ -37,7 +37,7 @@ public class SysRole {
 	
 	/** 删除标识（0-正常,1-删除） */
 	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	@ApiModelProperty(value = "菜单列表",required = false)
 	private List<Long> menuIds;

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -55,7 +55,7 @@ public class SysUser implements Serializable{
 
 	/** 0-正常，1-删除 */
 	@ApiModelProperty(value = "0-正常，1-删除",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	/** 微信openid */
 	@ApiModelProperty(value = "微信openid",required = false)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserDevice.java

@@ -28,7 +28,7 @@ public class SysUserDevice {
 	
 	private String clientId;
 	
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 	
 	private SysUser user;
 	

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsInformation.java

@@ -65,7 +65,7 @@ public class SysNewsInformation {
 	@ApiModelProperty(value = "备注", required = false)
 	private String memo;
 
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	private Integer tenantId;
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsType.java

@@ -17,7 +17,7 @@ public class SysNewsType {
 	private Long parentId;
 	
 	/**  */
-	private boolean delFlag;
+	private Boolean delFlag= false;
 	
 	/**  */
 	private java.util.Date createTime;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -31,14 +31,6 @@ public class SubjectController extends BaseController {
 	@Autowired
 	private SubjectService subjectService;
 
-	@ApiOperation(value = "修改、新增科目")
-	@PostMapping("/upset")
-	@PreAuthorize("@pcs.hasPermissions('subject/upset')")
-	public Object update(@RequestBody Subject subject) {
-		subjectService.upSetSubject(subject);
-		return succeed();
-	}
-
 	@ApiOperation(value = "根据科目编号查询科目")
 	@GetMapping("/get/{id}")
 	@PreAuthorize("@pcs.hasPermissions('subject/get')")
@@ -46,14 +38,6 @@ public class SubjectController extends BaseController {
 		return succeed(subjectService.get(id));
 	}
 
-	@ApiOperation(value = "删除指定科目")
-	@PostMapping("/delete/{id}")
-	@PreAuthorize("@pcs.hasPermissions('subject/get')")
-	public HttpResponseResult<Subject> delete(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
-		subjectService.deleteById(id);
-		return succeed();
-	}
-
 	@ApiOperation(value = "分页查询科目列表")
 	@GetMapping("/queryPage")
 	@PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
@@ -64,13 +48,10 @@ public class SubjectController extends BaseController {
 				.collect(Collectors.toMap(Subject::getId, t -> t));
 
 		pageInfo.getRows().forEach(row -> {
-
 			if(row.getParentSubjectId() != null && row.getParentSubjectId() > 0) {
 				row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
 			}
-
 		});
-
 		return succeed(pageInfo);
 	}
 
@@ -80,4 +61,20 @@ public class SubjectController extends BaseController {
 	public HttpResponseResult<PageInfo<Subject>> queryPageTree(SubjectQueryInfo queryInfo) {
 		return succeed(subjectService.queryPageTree(queryInfo));
 	}
+
+	@ApiOperation(value = "修改、新增科目")
+	@PostMapping("/upset")
+	@PreAuthorize("@pcs.hasPermissions('subject/upset')")
+	public Object update(@RequestBody Subject subject) {
+		subjectService.upSetSubject(subject);
+		return succeed();
+	}
+
+	@ApiOperation(value = "删除指定科目")
+	@PostMapping("/delete/{id}")
+	@PreAuthorize("@pcs.hasPermissions('subject/get')")
+	public HttpResponseResult<Subject> delete(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
+		subjectService.deleteById(id);
+		return succeed();
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -10,27 +10,34 @@ import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
 public interface SubjectDao extends BaseDAO<Long, Subject> {
-
-    /**
+    /***
+     * 通过id集合查询声部
+     * @param: subjectIds
+     * @updateTime 2022/4/6 11:37
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+     */
+    List<Subject> findBySubjectIds(@Param("subjectIds") List<Long> subjectIds);
+    /***
+     * 通过声部id（字符串拼接）查询声部
+     * @param: subjectIdList
+     * @updateTime 2022/4/6 11:35
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+     */
+    List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
+    /***
      * 根据父级id查询子级列表
-     *
-     * @param parentId
-     * @return
+     * @param: parentId
+     * @param: delFlag
+     * @updateTime 2022/4/6 11:40
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
      */
     List<Subject> findByParentId(@Param("parentId") Long parentId, @Param("delFlag") YesOrNoEnum delFlag);
-
-    /**
-     * 根据声部编号列表获取声部名称map
-     *
-     * @param subjectIds
-     * @return
+    /***
+     * 通过id删除
+     * @param: id
+     * @updateTime 2022/4/6 11:41
+     * @return: int
      */
-    List<Map<Long, String>> queryNameByIds(@Param("subjectIds") String subjectIds);
-
-    List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
-
-    List<Subject> findBySubjectIds(@Param("subjectIds") List<Long> subjectIds);
-    
     int deleteById(Long id);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicTag.java

@@ -38,7 +38,7 @@ public class MusicTag implements Serializable {
 
 	@TableField(value = "del_flag_")
     @ApiModelProperty(value = "假删标识（0：正常，1：删除）")
-    private Boolean delFlag;
+    private Boolean delFlag= false;
 
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -43,7 +43,7 @@ public class Subject {
 	
 	/**  */
 	@ApiModelProperty(value = "是否删除1是，0否",required = false)
-	private Boolean delFlag;
+	private Boolean delFlag= false;
 
 	/**  */
 	@ApiModelProperty(value = "子节点列表",required = false)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SubjectService.java

@@ -9,24 +9,42 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
 public interface SubjectService extends BaseService<Long, Subject> {
-
-	/**
-	 * 分页查询科目树状列表
-	 *
-	 * @param queryInfo
-	 * @return
+	/***
+	 * 通过id集合查询声部
+	 * @param: subjectIdList
+	 * @updateTime 2022/4/6 11:27
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+	 */
+	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
+	/***
+	 * 通过声部id（字符串拼接）查询声部
+	 * @author liweifan
+	 * @param: subjectIdList
+	 * @updateTime 2022/4/6 11:31
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+	 */
+	List<Subject> findBySubjectByIdList(String subjectIdList);
+	/***
+	 * 分页查询声部树状列表
+	 * @param: queryInfo
+	 * @updateTime 2022/4/6 11:28
+	 * @return: com.yonge.cooleshow.common.page.PageInfo<com.yonge.cooleshow.biz.dal.entity.Subject>
 	 */
 	PageInfo<Subject> queryPageTree(SubjectQueryInfo queryInfo);
-    
-    int deleteById(Long id);
-
-	/**
-	 * 修改、新增科目树状列表
-	 *
-	 * @param subject
+	/***
+	 * 修改、新增声部树状列表
+	 * @param: subject
+	 * @updateTime 2022/4/6 11:28
 	 */
 	void upSetSubject(Subject subject);
-
+	/***
+	 * 通过id删除声部
+	 * @author liweifan
+	 * @param: id
+	 * @updateTime 2022/4/6 11:29
+	 * @return: int
+	 */
+    int deleteById(Long id);
 	/***
 	 * 查询科目选择框
 	 * @author liweifan
@@ -34,10 +52,4 @@ public interface SubjectService extends BaseService<Long, Subject> {
 	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>
 	 */
 	List<SubjectSelectVo> subjectSelect();
-
-	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
-
-	List<Subject> findBySubjectByIdList(String subjectIdList);
-
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -18,6 +18,7 @@ import com.yonge.cooleshow.biz.dal.service.SubjectService;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.util.CollectionUtils;
 
 @Service
 public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implements SubjectService {
@@ -31,6 +32,15 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
     }
 
     @Override
+    public List<Subject> findBySubjectByIdList(List<Long> subjectIdList) {
+        return subjectDao.findBySubjectIds(subjectIdList);
+    }
+    @Override
+    public List<Subject> findBySubjectByIdList(String subjectIdList) {
+        return subjectDao.findBySubjectByIdList(subjectIdList);
+    }
+
+    @Override
     public PageInfo<Subject> queryPageTree(SubjectQueryInfo queryInfo) {
         PageInfo<Subject> pageInfo = queryPage(queryInfo);
         for (Subject subject : pageInfo.getRows()) {
@@ -59,46 +69,6 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         }
     }
 
-    private Long upset(Subject subject, Long parentId) {
-        if (parentId != null) {
-            subject.setParentSubjectId(parentId);
-        }
-        if (subject.getId() != null) {
-            subject.setUpdateTime(new Date());
-            subjectDao.update(subject);
-        } else {
-            subjectDao.insert(subject);
-        }
-        return subject.getId();
-    }
-
-
-    private Subject getTree(Subject sub, YesOrNoEnum yesOrNoEnum) {
-        //得到根节点对象
-        //获取子节点list
-        List<Subject> subjects = subjectDao.findByParentId(sub.getId(), yesOrNoEnum);
-        //如果存在子节点
-        if (subjects != null && subjects.size() > 0) {
-            //将子节点list放入父节点对象
-            sub.setSubjects(subjects);
-            //遍历子节点....
-            for (Subject subject : subjects) {
-                getTree(subject, yesOrNoEnum);
-            }
-        }
-        return sub;
-    }
-
-    @Override
-    public List<Subject> findBySubjectByIdList(List<Long> subjectIdList) {
-        return subjectDao.findBySubjectByIdList(StringUtils.join(subjectIdList, ","));
-    }
-
-    @Override
-    public List<Subject> findBySubjectByIdList(String subjectIdList) {
-        return subjectDao.findBySubjectByIdList(subjectIdList);
-    }
-
     @Override
     public List<SubjectSelectVo> subjectSelect() {
         List<Subject> allList = subjectDao.findAll(new HashMap<>());
@@ -114,11 +84,11 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         });
 
         List<SubjectSelectVo> parents = allListVo.stream()
-                .filter(o -> (!o.getParentSubjectId().equals(0) && null != o.getParentSubjectId()))
+                .filter(o -> (null == o.getParentSubjectId() || o.getParentSubjectId().equals(0L) ))
                 .collect(Collectors.toList());
 
         List<SubjectSelectVo> subjects = allListVo.stream()
-                .filter(o -> (null == o.getParentSubjectId() || o.getParentSubjectId().equals(0)))
+                .filter(o -> !(null == o.getParentSubjectId() || o.getParentSubjectId().equals(0L)))
                 .collect(Collectors.toList());
 
         for (SubjectSelectVo parent : parents) {
@@ -130,10 +100,58 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
                     continue;
                 }
                 if (subject.getParentSubjectId().equals(parent.getId())) {
-                    parent.getChildren().add(subject);
+                    List<SubjectSelectVo> children = parent.getChildren();
+                    if(CollectionUtils.isEmpty(children)){
+                        children = new ArrayList<>();
+                    }
+                    children.add(subject);
+                    parent.setChildren(children);
                 }
             }
         }
         return parents;
     }
+
+
+    /***
+     * 新增、修改声部
+     * @param: subject
+     * @param: parentId
+     * @updateTime 2022/4/6 11:33
+     * @return: java.lang.Long
+     */
+    private Long upset(Subject subject, Long parentId) {
+        if (parentId != null) {
+            subject.setParentSubjectId(parentId);
+        }
+        if (subject.getId() != null) {
+            subject.setUpdateTime(new Date());
+            subjectDao.update(subject);
+        } else {
+            subjectDao.insert(subject);
+        }
+        return subject.getId();
+    }
+    /***
+     * 查询声部树
+     * @param: sub
+     * @param: yesOrNoEnum
+     * @updateTime 2022/4/6 11:33
+     * @return: com.yonge.cooleshow.biz.dal.entity.Subject
+     */
+    private Subject getTree(Subject sub, YesOrNoEnum yesOrNoEnum) {
+        //得到根节点对象
+        //获取子节点list
+        List<Subject> subjects = subjectDao.findByParentId(sub.getId(), yesOrNoEnum);
+        //如果存在子节点
+        if (subjects != null && subjects.size() > 0) {
+            //将子节点list放入父节点对象
+            sub.setSubjects(subjects);
+            //遍历子节点....
+            for (Subject subject : subjects) {
+                getTree(subject, yesOrNoEnum);
+            }
+        }
+        return sub;
+    }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -93,10 +93,6 @@
         </where>
     </select>
 
-    <select id="queryNameByIds" resultType="java.util.Map">
-        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0
-    </select>
-
     <sql id="querySubPageSql">
         <where>
             <if test="parentId != null">
@@ -126,8 +122,6 @@
     </select>
 
 	<delete id="deleteById">
-		update subject set del_flag_ = 1 where id_ = #{id};
-		update subject set del_flag_ = 1 where parent_subject_id_ = #{id};
+		update subject set del_flag_ = 1 where id_ = #{id} or parent_subject_id_ = #{id}
 	</delete>
-
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SubjectController.java

@@ -1,18 +1,19 @@
 package com.yonge.cooleshow.student.controller;
 
+import com.yonge.cooleshow.biz.dal.service.SubjectService;
+import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
-import com.yonge.cooleshow.biz.dal.service.SubjectService;
-import com.yonge.cooleshow.common.controller.BaseController;
+import java.util.List;
 
 @RequestMapping("subject")
 @Api(tags = "科目服务")
@@ -28,15 +29,10 @@ public class SubjectController extends BaseController {
 		return succeed(subjectService.get(id));
 	}
 
-	@ApiOperation(value = "分页查询科目列表")
-	@GetMapping("/queryPage")
-	public Object queryPage(SubjectQueryInfo queryInfo) {
-		return succeed(subjectService.queryPage(queryInfo));
-	}
-
-	@ApiOperation(value = "分页查询科目树状列表")
-	@GetMapping("/queryPageTree")
-	public Object queryPageTree(SubjectQueryInfo queryInfo) {
-		return succeed(subjectService.queryPageTree(queryInfo));
-	}
+	@ApiOperation(value = "获取科目")
+	@GetMapping("/subjectSelect")
+    public HttpResponseResult<List<SubjectSelectVo>> subjectSelect(){
+        List<SubjectSelectVo> subjectSelect = subjectService.subjectSelect();
+        return succeed(subjectSelect);
+    }
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SubjectController.java

@@ -32,24 +32,8 @@ public class SubjectController extends BaseController {
 		return succeed(subjectService.get(id));
 	}
 
-	@ApiOperation(value = "分页查询科目列表")
-	@GetMapping("/queryPage")
-	public Object queryPage(SubjectQueryInfo queryInfo) {
-		return succeed(subjectService.queryPage(queryInfo));
-	}
-
-	@ApiOperation(value = "分页查询科目树状列表")
-	@GetMapping("/queryPageTree")
-	public Object queryPageTree(SubjectQueryInfo queryInfo) {
-		return succeed(subjectService.queryPageTree(queryInfo));
-	}
-
-/***
-     * 获取科目
-     * @author liweifan
-     * @updateTime 2022/3/21 17:21
-     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>>
-     */
+	@ApiOperation(value = "获取科目")
+	@GetMapping("/subjectSelect")
     public HttpResponseResult<List<SubjectSelectVo>> subjectSelect(){
         List<SubjectSelectVo> subjectSelect = subjectService.subjectSelect();
         return succeed(subjectSelect);