接口调整

src/main/java/com/cjy/back/sysUser/dao/SysUserMapper.java

@@ -36,7 +36,7 @@ public interface SysUserMapper {
     List<Map<String,Object>> queryUserListByPage(@Param("page") PageParameter page, @Param("map") HashMap<String, Object> selMap);
 
     /**
-    * 
+    *
     * @Description:  根据用户id查询用户的一些信息
     * @param userid 用户id
     * @return 用户对象
@@ -46,7 +46,7 @@ public interface SysUserMapper {
     Map<String,Object> findById(Integer userid);
 
     /**
-    * 
+    *
     * @Description:  根据用户名查询该用户名是否已存在
     * @param logname 用户名
     * @return
@@ -56,7 +56,7 @@ public interface SysUserMapper {
     int findUserByLogName(@Param("logname")String logname,@Param("userkey")String userkey,@Param("type")String type);
 
     /**
-    * 
+    *
     * @Description:  新增用户
     * @param sysUser 用户实体
     * @return
@@ -68,7 +68,7 @@ public interface SysUserMapper {
     int updateUserGoogleCode(@Param("code") String code,@Param("userid") Integer userid);
 
     /**
-    * 
+    *
     * @Description:  修改用户信息
     * @param sysUser 用户实体对象
     * @return
@@ -78,7 +78,7 @@ public interface SysUserMapper {
     int updateUser(SysUser sysUser);
 
     /**
-    * 
+    *
     * @Description:  根据用户id查询用户
     * @param userid 用户id
     * @return 用户对象
@@ -86,12 +86,12 @@ public interface SysUserMapper {
     * @date 2019/8/23
     */
     SysUser selectUserById(Integer userid);
-    
+
     /**
-    * 
+    *
     * @Description:  根据用户id删除用户信息
     * @param userid 用户id
-    * @return 
+    * @return
     * @author hpr
     * @date 2019/8/23
     */
@@ -123,7 +123,7 @@ public interface SysUserMapper {
      * @param userkey
      * @return
      */
-    SysUser selectUserByWxUnionid(@Param("unionid") String unionid,@Param("userkey") String userkey);
+    SysUser selectUserByWxOpenid(@Param("openid") String openid,@Param("userkey") String userkey);
 
     /**
      * 保存用户信息

src/main/java/com/cjy/back/sysUser/dao/SysUserMapper.xml

@@ -42,18 +42,18 @@
 
     <!--查找用户名是否存在-->
     <select id="findUserByLogName" parameterType="string" resultType="java.lang.Integer">
-    
-        SELECT count(1) FROM sys_user WHERE logname = #{logname} 
-        
+
+        SELECT count(1) FROM sys_user WHERE logname = #{logname}
+
         <!-- <if test="type!='' and type!=null and type == 'ADMIN'">
         	AND usertype = 'LEVEL'
         </if>
-        
+
         <if test="type == ''">
         	AND userkey = #{userkey}
         </if> -->
-    
-        
+
+
     </select>
 
     <!--新增用户-->
@@ -99,8 +99,8 @@
     </select>
 
 
-    <select id="selectUserByWxUnionid" parameterType="string" resultType="com.cjy.back.sysUser.entity.SysUser">
-        SELECT * FROM sys_user WHERE wx_unionid = #{unionid} AND userkey = #{userkey}
+    <select id="selectUserByWxOpenid" parameterType="string" resultType="com.cjy.back.sysUser.entity.SysUser">
+        SELECT * FROM sys_user WHERE wx_openid = #{openid} AND userkey = #{userkey}
     </select>
 
     <insert id="saveWxUser" parameterType="map" keyProperty="userid" useGeneratedKeys="true">
@@ -153,4 +153,4 @@
     <delete id="deleteUserApp">
         DELETE FROM sys_user WHERE wx_unionid = #{userid} AND userkey = #{userkey}
     </delete>
-</mapper>
+</mapper>

src/main/java/com/cjy/back/sysUser/service/SysUserServiceImpl.java

@@ -796,11 +796,11 @@ public class SysUserServiceImpl implements SysUserService {
             return ServerResponse.createByRequestMessage("信息错误");
         }
         HashMap<String,Object> user = JSONObject.parseObject(data, HashMap.class);
-        String unionid = String.valueOf(user.get("unionid"));
-        if(StringUtils.isEmpty(unionid)){
+        String openid = String.valueOf(user.get("openid"));
+        if(StringUtils.isEmpty(openid)){
             return ServerResponse.createByRequestMessage("请重新授权");
         }
-        SysUser sysUser = sysUserMapper.selectUserByWxUnionid(unionid,userkey);
+        SysUser sysUser = sysUserMapper.selectUserByWxOpenid(openid,userkey);
         user.put("userkey",userkey);
         if(sysUser == null){
             //user.put("privilege",user.get("privilege").toString());
@@ -809,23 +809,23 @@ public class SysUserServiceImpl implements SysUserService {
             user.put("usertype","USER");
             user.put("updatetime",System.currentTimeMillis());
             sysUserMapper.saveWxUser(user);
-            sysUser = sysUserMapper.selectUserByWxUnionid(unionid,userkey);
-            //生成个人二维码
-            String fileName = sysUser.getUserid() + ".png";
-            HashMap<String, Object> codeMsg = new HashMap<>();
-            codeMsg.put("userid",sysUser.getUserid());
-            CommonUtil.createCode(fileName,codeMsg);
+//            sysUser = sysUserMapper.selectUserByWxUnionid(unionid,userkey);
+//            //生成个人二维码
+//            String fileName = sysUser.getUserid() + ".png";
+//            HashMap<String, Object> codeMsg = new HashMap<>();
+//            codeMsg.put("userid",sysUser.getUserid());
+//            CommonUtil.createCode(fileName,codeMsg);
         }else{
             sysUserMapper.updateWxUxer(user);
-            if(!new File(InitParam.codeUrl_filepath + "/" + sysUser.getUserid() + ".png").exists()){
-                //生成个人二维码
-                String fileName = sysUser.getUserid() + ".png";
-                HashMap<String, Object> codeMsg = new HashMap<>();
-                codeMsg.put("userid",sysUser.getUserid());
-                CommonUtil.createCode(fileName,codeMsg);
-            }
+//            if(!new File(InitParam.codeUrl_filepath + "/" + sysUser.getUserid() + ".png").exists()){
+//                //生成个人二维码
+//                String fileName = sysUser.getUserid() + ".png";
+//                HashMap<String, Object> codeMsg = new HashMap<>();
+//                codeMsg.put("userid",sysUser.getUserid());
+//                CommonUtil.createCode(fileName,codeMsg);
+//            }
         }
-        return ServerResponse.createBySuccess("执行成功",sysUser.getUserid());
+        return ServerResponse.createBySuccess("执行成功");
     }
 
     @Override

src/main/java/com/cjy/mobile/controller/YbsjLoginLogInfoController.java

@@ -45,10 +45,10 @@ public class YbsjLoginLogInfoController {
 	public ServerResponse insertLoginLog(HttpServletRequest request) {
 		System.out.println("--------------------------------");
 		String model = request.getParameter("model");//手机型号
-		String unionid = request.getParameter("unionid");//登录者主键id
+		String openid = request.getParameter("openid");//登录者主键id
 		String userkey = request.getParameter("userkey");//登录者主键id
 		String platform = request.getParameter("platform");//登录者主键id
-		SysUser sysUser = sysUserMapper.selectUserByWxUnionid(unionid, userkey);
+		SysUser sysUser = sysUserMapper.selectUserByWxOpenid(openid, userkey);
 		if(sysUser == null){
 			return ServerResponse.createByErrorMessage("保存异常");
 		}
@@ -88,6 +88,6 @@ public class YbsjLoginLogInfoController {
         userLogInfoMapper.insertRecord(logInfo);
         return ServerResponse.createBySuccessMessage("保存日志成功");
     }
-	
+
 
 }