Merge remote-tracking branch 'origin/master'

edu-im/edu-im-server/src/main/java/com/keao/edu/im/http/HttpHelper.java

@@ -258,14 +258,12 @@ public class HttpHelper {
 
     public HttpURLConnection createPostHttpConnection(String uri, String contentType)
         throws IOException {
-
         URL url = new URL(uri);
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         if (conn == null) {
             log.info("open url connection fail, url={}", uri);
             return null;
         }
-
         conn.setUseCaches(false);
         conn.setDoInput(true);
         conn.setDoOutput(true);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Teacher.java

@@ -2,7 +2,6 @@ package com.keao.edu.user.entity;
 
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.user.enums.TeacherSettlementTypeEnum;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -29,7 +28,7 @@ public class Teacher {
 	private java.math.BigDecimal salary;
 
 	@ApiModelProperty(value = "是否删除",required = false)
-	private YesOrNoEnum delFlag;
+	private Integer delFlag;
 
 	@ApiModelProperty(value = "总监考次数")
 	private Integer totalInvigilationNum;
@@ -79,11 +78,11 @@ public class Teacher {
 		this.tenantId = tenantId;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public Integer getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(Integer delFlag) {
 		this.delFlag = delFlag;
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -12,9 +12,7 @@ import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dao.TeacherDao;
-import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.Teacher;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.page.TeacherQueryInfo;
 import com.keao.edu.user.service.TeacherService;
 import com.keao.edu.util.collection.MapUtil;
@@ -70,14 +68,14 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 				}
 				sysUser.setUpdateTime(date);
 				sysUserDao.update(sysUser);
-			}else if (teacher1.getDelFlag() == YesOrNoEnum.YES){
+			}else if (teacher1.getDelFlag() == 1){
 				if(StringUtils.isEmpty(user.getUserType())){
 					sysUser.setUserType("TEACHER");
 				}else {
 					sysUser.setUserType(user.getUserType() + ",TEACHER");
 				}
 				sysUserDao.update(sysUser);
-				teacher.setDelFlag(YesOrNoEnum.NO);
+				teacher.setDelFlag(0);
 				teacherDao.update(teacher);
 			}else {
 				throw new BizException("用户已存在");

edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -12,7 +12,7 @@
 		<result column="subject_id_list_" property="subjectIdList" />
 		<result column="salary_settlement_type_" property="salarySettlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="salary_" property="salary" />
-		<result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result column="del_flag_" property="delFlag"/>
 		<result column="total_invigilation_num_" property="totalInvigilationNum"/>
 		<result column="total_invigilation_student_num_" property="totalInvigilationStudentNum"/>
 		<result column="total_settlement_fee_" property="totalSettlementCost"/>
@@ -53,7 +53,7 @@
 				salary_settlement_type_ = #{salarySettlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="delFlag != null">
-				del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				del_flag_ = #{delFlag},
 			</if>
 			<if test="salary != null">
 				salary_ = #{salary},