Browse Source

用户登录信息获取

Trick 6 years ago
parent
commit
60eb41e96e

+ 12 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@ -40,6 +40,15 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
            @RequestBody String jsonData) throws Exception {
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        if(roleDO.getId()!=null){
            roleDO.setUpdateUser(getUID());
            roleDO.setUpdateUserName(getUNAME());
        }else{
            roleDO.setUpdateUser(getUID());
            roleDO.setUpdateUserName(getUNAME());
            roleDO.setCreateUser(getUID());
            roleDO.setCreateUserName(getUNAME());
        }
        roleDO = roleService.save(roleDO);
        roleDO = roleService.save(roleDO);
        return success(roleDO, RoleVO.class);
        return success(roleDO, RoleVO.class);
    }
    }
@ -70,6 +79,9 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        if (null == roleDO.getId()) {
        if (null == roleDO.getId()) {
            return failed("ID不能为空", Envelop.class);
            return failed("ID不能为空", Envelop.class);
        }else{
            roleDO.setUpdateUser(getUID());
            roleDO.setUpdateUserName(getUNAME());
        }
        }
        roleDO = roleService.save(roleDO);
        roleDO = roleService.save(roleDO);
        return success(roleDO);
        return success(roleDO);

+ 42 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.wx.*;
import com.yihu.jw.base.dao.wx.*;
import com.yihu.jw.base.useragent.UserAgent;
import com.yihu.jw.entity.base.wx.*;
import com.yihu.jw.entity.base.wx.*;
import com.yihu.jw.restmodel.base.wx.*;
import com.yihu.jw.restmodel.base.wx.*;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.Envelop;
@ -22,6 +23,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.List;
import java.util.Map;
import java.util.Map;
import java.util.UUID;
import java.util.UUID;
@ -53,6 +55,8 @@ public class WechatService {
    private WxTemplateConfigDao wxTemplateConfigDao;
    private WxTemplateConfigDao wxTemplateConfigDao;
    @Autowired
    @Autowired
    private WxAccessTokenService wxAccessTokenService;
    private WxAccessTokenService wxAccessTokenService;
    @Autowired
    private UserAgent userAgent;
    //====================微信与租户管理=======================
    //====================微信与租户管理=======================
@ -153,6 +157,10 @@ public class WechatService {
    public Envelop saveWxAndSaas(WxWechatDO wxWechatDO, List<WxWechatSaasDO> wxWechatSaasDOs){
    public Envelop saveWxAndSaas(WxWechatDO wxWechatDO, List<WxWechatSaasDO> wxWechatSaasDOs){
        wxWechatDO.setCreateUser(userAgent.getUID());
        wxWechatDO.setCreateUserName(userAgent.getUNAME());
        wxWechatDO.setUpdateUser(userAgent.getUID());
        wxWechatDO.setUpdateUserName(userAgent.getUNAME());
        WxWechatDO wechat = wechatDao.save(wxWechatDO);
        WxWechatDO wechat = wechatDao.save(wxWechatDO);
        if(wxWechatSaasDOs!=null&&wxWechatSaasDOs.size()>0){
        if(wxWechatSaasDOs!=null&&wxWechatSaasDOs.size()>0){
@ -171,6 +179,9 @@ public class WechatService {
    }
    }
    public Envelop updateWxAndSaas(WxWechatDO wxWechatDO, List<WxWechatSaasDO> wxWechatSaasDOs) {
    public Envelop updateWxAndSaas(WxWechatDO wxWechatDO, List<WxWechatSaasDO> wxWechatSaasDOs) {
        //设置更新人
        wxWechatDO.setUpdateUser(userAgent.getUID());
        wxWechatDO.setUpdateUserName(userAgent.getUNAME());
        wechatDao.save(wxWechatDO);
        wechatDao.save(wxWechatDO);
        //删除该微信所以SaaS关联关系
        //删除该微信所以SaaS关联关系
@ -298,6 +309,16 @@ public class WechatService {
    }
    }
    public Envelop saveImg(WxGraphicMessageDO wxGraphicMessageDO){
    public Envelop saveImg(WxGraphicMessageDO wxGraphicMessageDO){
        if(wxGraphicMessageDO.getId()!=null){
            wxGraphicMessageDO.setUpdateUser(userAgent.getUID());
            wxGraphicMessageDO.setUpdateUserName(userAgent.getUNAME());
        }else{
            wxGraphicMessageDO.setCreateUser(userAgent.getUID());
            wxGraphicMessageDO.setCreateUser(userAgent.getUNAME());
            wxGraphicMessageDO.setUpdateUser(userAgent.getUID());
            wxGraphicMessageDO.setUpdateUserName(userAgent.getUNAME());
        }
        wxGraphicMessageDao.save(wxGraphicMessageDO);
        wxGraphicMessageDao.save(wxGraphicMessageDO);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
    }
    }
@ -495,6 +516,17 @@ public class WechatService {
    //===================模板消息==========================================
    //===================模板消息==========================================
    public Envelop saveWxTemp(WxTemplateDO wxTemplateDO){
    public Envelop saveWxTemp(WxTemplateDO wxTemplateDO){
        if(wxTemplateDO.getId()!=null){
            wxTemplateDO.setUpdateUser(userAgent.getUID());
            wxTemplateDO.setUpdateUserName(userAgent.getUNAME());
        }else{
            wxTemplateDO.setCreateUser(userAgent.getUID());
            wxTemplateDO.setCreateUserName(userAgent.getUNAME());
            wxTemplateDO.setUpdateUser(userAgent.getUID());
            wxTemplateDO.setUpdateUserName(userAgent.getUNAME());
        }
        wxTemplateDao.save(wxTemplateDO);
        wxTemplateDao.save(wxTemplateDO);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
    }
    }
@ -566,6 +598,16 @@ public class WechatService {
    }
    }
    public Envelop saveWxTempConfig(WxTemplateConfigDO wxTemplateConfigDO){
    public Envelop saveWxTempConfig(WxTemplateConfigDO wxTemplateConfigDO){
        if(wxTemplateConfigDO.getId()!=null){
            wxTemplateConfigDO.setUpdateUser(userAgent.getUID());
            wxTemplateConfigDO.setUpdateUserName(userAgent.getUNAME());
        }else{
            wxTemplateConfigDO.setCreateUser(userAgent.getUID());
            wxTemplateConfigDO.setUpdateUserName(userAgent.getUNAME());
            wxTemplateConfigDO.setUpdateUser(userAgent.getUID());
            wxTemplateConfigDO.setUpdateUserName(userAgent.getUNAME());
        }
        wxTemplateConfigDao.save(wxTemplateConfigDO);
        wxTemplateConfigDao.save(wxTemplateConfigDO);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
    }
    }

+ 1 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/useragent/UserAgent.java

@ -10,6 +10,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequest;
/**
/**
 * 用户头部信息获取
 * Created by Trick on 2018/10/30.
 * Created by Trick on 2018/10/30.
 */
 */
@Component
@Component