update

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/PhoneAuthenticationProvider.java

@@ -2,9 +2,6 @@ package com.yonge.cooleshow.auth.core.provider;
 
 import java.util.Date;
 
-import com.yonge.cooleshow.auth.api.entity.SysConfig;
-import com.yonge.cooleshow.auth.service.SysConfigService;
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.InternalAuthenticationServiceException;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -2,15 +2,14 @@ package com.yonge.cooleshow.auth.dal.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
-import com.yonge.cooleshow.auth.api.vo.UserSetVo;
-import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
-import org.apache.ibatis.annotations.Param;
-
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.UserLockFlag;
+import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -3,26 +3,24 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
-import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
-import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
-import com.yonge.cooleshow.auth.api.dto.UserSetReq;
-import com.yonge.cooleshow.auth.api.vo.UserSetVo;
-import com.yonge.cooleshow.auth.service.SysConfigService;
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
-import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.SysUserInfo;
+import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
+import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
+import com.yonge.cooleshow.auth.service.SysConfigService;
 import com.yonge.cooleshow.auth.service.SysRoleMenuService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.auth.service.SysUserService;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.exception.BizException;
@@ -179,14 +177,20 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveStudent(Long userId) {
         sysUserDao.saveStudent(userId);
+        //创建老师账户
+        sysUserDao.createUserAccount(userId);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveTeacher(Long userId) {
 
         sysUserDao.saveTeacher(userId);
+        //创建老师账户
+        sysUserDao.createUserAccount(userId);
     }
 
     @Override

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

@@ -72,7 +72,7 @@ public class SubjectController extends BaseController {
 
 	@ApiOperation(value = "删除指定声部")
 	@PostMapping("/delete/{id}")
-	@PreAuthorize("@pcs.hasPermissions('subject/get')")
+	@PreAuthorize("@pcs.hasPermissions('subject/delete')")
 	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

@@ -1,12 +1,10 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
 public interface SubjectDao extends BaseDAO<Long, Subject> {
@@ -45,4 +43,6 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
 
     //根据声部id查详情
     Subject selectSubjectById(String lessonSubject);
+    
+    Subject queryByName(String name);
 }

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

@@ -35,6 +35,8 @@ public class MemberPriceSettings {
 	@ApiModelProperty(value = "更新人",required = false)
 	private Long updateBy;
 	
+	private String modifierName;
+	
 	public MemberPriceSettings setId(Integer id){
 		this.id = id;
 		return this;
@@ -107,6 +109,14 @@ public class MemberPriceSettings {
 		return this.updateBy;
 	}
 			
+	public String getModifierName() {
+		return modifierName;
+	}
+
+	public void setModifierName(String modifierName) {
+		this.modifierName = modifierName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -59,6 +59,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
             //初始密码，手机号后6位
             String password = param.getPhone().substring(param.getPhone().length() - 6);
             sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
+            sysUser.setGender(param.getGender().getCode());
             sysUser.setCreateTime(new Date());
             sysUser.setUpdateTime(new Date());
             employeeDao.insertSysUser(sysUser);

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

@@ -11,8 +11,10 @@ import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
 import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+
 import org.springframework.util.CollectionUtils;
 
 @Service
@@ -51,16 +53,20 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
 
 	@Override
     public void upSetSubject(Subject subject) {
-        if (subject.getDelFlag()) {
-            subjectDao.delete(subject.getId());
-            return;
-        }
-        Long parentId = upset(subject, null);
-        List<Subject> subjects = subject.getSubjects();
-        if (subjects != null && subjects.size() > 0) {
-            subjects.forEach(e -> {
-                upset(e, parentId);
-            });
+		
+		Subject orginSubject = subjectDao.queryByName(subject.getName());
+		
+		if(orginSubject != null){
+			if(orginSubject.getId() != subject.getId()){
+				throw new BizException("名称已存在，请修改名称");
+			}
+		}
+		
+		if (subject.getId() != null) {
+            subject.setUpdateTime(new Date());
+            subjectDao.update(subject);
+        } else {
+            subjectDao.insert(subject);
         }
     }
 
@@ -98,25 +104,6 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
     }
 
     /***
-     * 新增、修改声部
-     * @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

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

@@ -107,9 +107,9 @@
             keyProperty="id">
         INSERT INTO sys_user
         (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
-        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,certificate_type_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,certificate_type_,password_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{certificateType})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{certificateType},#{password})
     </insert>
 
     <update id="updateSysUser" parameterType="com.yonge.cooleshow.auth.api.entity.SysUser">

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

@@ -13,6 +13,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="create_by_" property="createBy" />
 		<result column="update_by_" property="updateBy" />
+		<result column="modifier_name_" property="modifierName" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -75,7 +76,7 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM member_price_settings ORDER BY id_
+		SELECT mps.*,ifnull(u.real_name_,u.username_) modifier_name_ FROM member_price_settings mps left join sys_user u on mps.update_by_ = u.id_ ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 

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

@@ -124,9 +124,15 @@
             #{subjectId}
         </foreach>
     </select>
+    
     <select id="selectSubjectById" resultType="com.yonge.cooleshow.biz.dal.entity.Subject"
             parameterType="java.lang.String">
         SELECT * FROM subject WHERE del_flag_ = 0 and id_=#{lessonSubject}
     </select>
+    
+    <select id="queryByName" resultType="com.yonge.cooleshow.biz.dal.entity.Subject"
+            parameterType="java.lang.String">
+        SELECT * FROM subject WHERE del_flag_ = 0 and name_ = #{name}
+    </select>
 
 </mapper>