flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -99,6 +99,7 @@ newSysUser.setAvatar(huaChengSysUser.getImageUrl()); newSysUser.setCreateTime(LocalDateTime.now()); newSysUser.setUpdateTime(LocalDateTime.now()); newSysUser.setOpenid(huaChengSysUser.getOpenid()); IUserService.insertConfig(newSysUser); }
@@ -230,6 +230,12 @@ @ApiModelProperty("办结事项名称") private String transactionNames; /** * 微信小程序id */ @ApiModelProperty("微信小程序id") private String openid;
@@ -2,8 +2,10 @@ import com.dg.core.Constant; import com.dg.core.annotation.Authorization; import com.dg.core.db.gen.entity.HuaChengSysUser; import com.dg.core.db.gen.entity.SysUser; import com.dg.core.manager.TokenManager; import com.dg.core.service.IHuaChengSysUserService; import org.apache.catalina.connector.ResponseFacade; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; /** * 自定义拦截器，判断此次请求是否有权限 @@ -29,6 +32,12 @@ @Autowired com.dg.core.service.ISysUserService IUserService; /** * 花城e+用户接口 */ @Autowired IHuaChengSysUserService iHuaChengSysUserService; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { @@ -53,7 +62,27 @@ //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入 request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken)); System.out.println("花城用户id："+manager.getHCUserId(HCtoken)); // SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+""); SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+""); if(ss==null) { HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","",""); if(huaChengSysUser!=null) { //本地没有此用户 新用户 SysUser newSysUser=new SysUser(); //默认 1系统后台用户 newSysUser.setUserType("1"); newSysUser.setPhonenumber(huaChengSysUser.getPhone()); newSysUser.setUserId(huaChengSysUser.getUserId()); newSysUser.setUserName(huaChengSysUser.getNickName()); newSysUser.setSex(huaChengSysUser.getSex()); newSysUser.setAvatar(huaChengSysUser.getImageUrl()); newSysUser.setCreateTime(LocalDateTime.now()); newSysUser.setUpdateTime(LocalDateTime.now()); newSysUser.setOpenid(huaChengSysUser.getOpenid()); IUserService.insertConfig(newSysUser); } } return true; } @@ -68,8 +97,8 @@ } } if(!StringUtils.isEmpty(token)) { // if(!StringUtils.isEmpty(token)) // { //如果验证token失败，并且方法或类注明了Authorization，返回401错误 if (method.getAnnotation(Authorization.class) != null || bean.getClass().getAnnotation(Authorization.class) != null) @@ -81,7 +110,7 @@ facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length); facade.getWriter().write(reponse); return false; } // } } return true; } flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -96,6 +96,7 @@ newUser.setAvatar(huaChengSysUser.getImageUrl()); newUser.setCreateTime(LocalDateTime.now()); newUser.setUpdateTime(LocalDateTime.now()); newUser.setOpenid(huaChengSysUser.getOpenid()); baseMapper.insertConfig(newUser); } } flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -34,6 +34,7 @@ <result property="masterNames" column="master_names" /> <result property="transactionIds" column="transaction_ids" /> <result property="transactionNames" column="transaction_names" /> <result property="openid" column="openid" /> </resultMap> <sql id="selectSysUserVo"> @@ -69,6 +70,7 @@ master_names, transaction_ids, transaction_names, openid, (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name FROM automessage_sys_user @@ -155,6 +157,7 @@ <if test="masterNames != null and masterNames != '' ">,master_names</if> <if test="transactionIds != null and transactionIds != '' ">,transaction_ids</if> <if test="transactionNames != null and transactionNames != '' ">,transaction_names</if> <if test="openid != null and openid != '' ">,openid</if> )values( sysdate() <if test="userId != null and userId != '' ">,#{userId}</if> @@ -187,6 +190,7 @@ <if test="masterNames != null and masterNames != '' ">,#{masterNames}</if> <if test="transactionIds != null and transactionIds != '' ">,#{transactionIds}</if> <if test="transactionNames != null and transactionNames != '' ">,#{transactionNames}</if> <if test="openid != null and openid != '' ">,#{openid}</if> ) </insert> @@ -223,6 +227,7 @@ <if test="masterNames != null and masterNames != '' ">,master_names=#{masterNames}</if> <if test="transactionIds != null and transactionIds != '' ">,transaction_ids=#{transactionIds}</if> <if test="transactionNames != null and transactionNames != '' ">,transaction_names=#{transactionNames}</if> <if test="openid != null and openid != '' ">,openid=#{openid}</if> ,update_time=sysdate() </set> where user_id= #{userId}
