| 
					
				 | 
			
			
				@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.alibaba.fastjson.JSONArray; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.alibaba.fastjson.JSONObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				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.restmodel.base.wx.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				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.transaction.annotation.Transactional; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import java.util.Date; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import java.util.UUID; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -53,6 +55,8 @@ public class WechatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    private WxTemplateConfigDao wxTemplateConfigDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    private WxAccessTokenService wxAccessTokenService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    private UserAgent userAgent; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    //====================微信与租户管理======================= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -153,6 +157,10 @@ public class WechatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    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); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(wxWechatSaasDOs!=null&&wxWechatSaasDOs.size()>0){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -171,6 +179,9 @@ public class WechatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public Envelop updateWxAndSaas(WxWechatDO wxWechatDO, List<WxWechatSaasDO> wxWechatSaasDOs) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //设置更新人 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        wxWechatDO.setUpdateUser(userAgent.getUID()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        wxWechatDO.setUpdateUserName(userAgent.getUNAME()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        wechatDao.save(wxWechatDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //删除该微信所以SaaS关联关系 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -298,6 +309,16 @@ public class WechatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    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); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -495,6 +516,17 @@ public class WechatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    //===================模板消息========================================== 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    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); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -566,6 +598,16 @@ public class WechatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    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); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 |