合伙人修改和新增活动管理

common/src/main/java/com/winsun/bean/Partner.java

@@ -27,10 +27,6 @@ public class Partner implements Serializable {
      */
      */
     private String phoneNum;
     private String phoneNum;
 
 
-    /**
-     * 学校
-     */
-    private String school;
 
 
     /**
     /**
      * 密码
      * 密码
@@ -68,10 +64,6 @@ public class Partner implements Serializable {
     @TableField(value = "class")
     @TableField(value = "class")
     private String grade;
     private String grade;
 
 
-    /**
-     * 合伙人对应的微信账号
-     */
-    private String wxId;
 
 
     /**
     /**
      * 合伙人的状态
      * 合伙人的状态
@@ -82,16 +74,4 @@ public class Partner implements Serializable {
      * 预实名账号id
      * 预实名账号id
      */
      */
     private int ysm;
     private int ysm;
-
-    /**
-     * 督导id
-     */
-    private String leaderId;
-
-    /**
-     * 学校id
-     */
-    private int schoolId;
-
-
 }
 }

common/src/main/java/com/winsun/mapper/PartnerMapper.java

@@ -2,8 +2,15 @@ package com.winsun.mapper;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.Partner;
 import com.winsun.bean.Partner;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
@@ -11,10 +18,22 @@ import org.springframework.stereotype.Component;
 @Component
 @Component
 public interface PartnerMapper extends BaseMapper<Partner> {
 public interface PartnerMapper extends BaseMapper<Partner> {
 
 
-    @Update("update sys_user set phone = #{phone} ,name = #{name} ,account = #{account} ,sex = #{gender} ,substName = #{area} where id=#{id}")
-    int updateSysUser(@Param("phone") String phone,@Param("name") String name,@Param("account") String account,@Param("gender") String gender,@Param("area") String area,@Param("id") String id);
+    @Update("update sys_user set phone = #{phone} ,name = #{name} ,account = #{account} ,sex = #{sex}  where id=#{id}")
+    int updateSysUser(@Param("phone") String phone,@Param("name") String name,@Param("account") String account,@Param("sex") String sex,@Param("id") String id);
+
+    @Update("update hhr_user set ysm = #{ysm} ,grade = #{grade} ,id_card = #{idCard},position = #{position} ,parent_id = #{parentId} ,parent_ids = #{parentIds}  where id=#{id}")
+    int updateHhUser(@Param("ysm") String ysm,@Param("grade") String grade,@Param("idCard") String idCard,@Param("position") String position,@Param("parentId") String parentId,@Param("parentIds") String parentIds,@Param("id") String id);
+    
+    @Update("update hhr_user_school set school_id = #{schoolId}  where user_id=#{userId}")
+    int updateSchoolRef(@Param("schoolId") String schoolId,@Param("userId") String userId);
+    
+    @Select("select *  from `sys_user` where account = #{account} order by createtime desc")
+    List<Map<String, Object>> selectSysUser(String account);
+    
+    @Insert(" replace into hhr_user_school(user_id,school_id) VALUES(#{userId},#{schoolId})")
+    int saveSchoolRef(@Param("userId") String userId,@Param("schoolId") String schoolId);
     
     
-    @Update("update hhr_user set ysm = #{ysm} ,wx_id = #{wxId} ,id_card = #{idCard} ,school = #{school}  where id=#{id}")
-    int updateHhUser(@Param("ysm") String ysm,@Param("wxId") String wxId,@Param("idCard") String idCard,@Param("school") String school,@Param("id") String id);
+    @Select(" select * from hhr_user_school")
+    List<Map<String, Object>> getSchoolRef();
     
     
 }
 }

common/src/main/java/com/winsun/utils/MD5Utils.java

 package com.winsun.utils;
 package com.winsun.utils;
 
 
-import lombok.extern.slf4j.Slf4j;
-
 import java.math.BigInteger;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.apache.shiro.util.ByteSource;
+
+import lombok.extern.slf4j.Slf4j;
 
 
 @Slf4j
 @Slf4j
 public class MD5Utils {
 public class MD5Utils {
+	
+	/**
+     * 加盐参数
+     */
+    public final static String hashAlgorithmName = "MD5";
+
+    /**
+     * 循环次数
+     */
+    public final static int hashIterations = 1024;
+    
+    /**
+     * shiro密码加密工具类
+     *
+     * @param credentials 密码
+     * @param saltSource 密码盐
+     * @return
+     */
+    public static String md5(String credentials, String saltSource) {
+        ByteSource salt = new Md5Hash(saltSource);
+        return new SimpleHash(hashAlgorithmName, credentials, salt, hashIterations).toString();
+    }
+	
     /**
     /**
      * 使用md5的算法进行加密
      * 使用md5的算法进行加密
      */
      */
@@ -50,4 +78,25 @@ public class MD5Utils {
             return null;
             return null;
         }
         }
     }
     }
+    
+    /**
+     * 获取随机位数的字符串
+     */
+    public static String getRandomString(int length) {
+        String base = "abcdefghijklmnopqrstuvwxyz0123456789";
+        SecureRandom random;
+        StringBuffer sb = new StringBuffer();
+        
+		try {
+			random = SecureRandom.getInstance("SHA1PRNG");
+			for (int i = 0; i < length; i++) {
+			    int number = random.nextInt(base.length());
+			    sb.append(base.charAt(number));
+			}
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+      
+        return sb.toString();
+    }
 }
 }