From 58e881e2b559847b1d7b007ffe500e53ebb24ffe Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Fri, 17 Jan 2020 15:25:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?wbs=E7=AD=BE=E5=88=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tall/persist/dao/ProPluginSigninDao.java | 8 + .../persist/dao/ProPluginSigninFuzzyDao.java | 8 + .../tall/persist/dao/SigninFieldDao.java | 8 + .../com/ccsens/tall/service/ExcelService.java | 2 + .../tall/service/IWbsSubSheetService.java | 1 + .../com/ccsens/tall/service/UserService.java | 53 +- .../tall/service/WbsSubSheetService.java | 166 +++- .../main/java/com/ccsens/util/CodeEnum.java | 1 + .../main/java/com/ccsens/util/WechatUtil.java | 860 +++++++++--------- .../java/com/ccsens/util/WordToJpgUtil.java | 2 +- .../java/com/ccsens/util/wx/WxXcxUtil.java | 8 +- 11 files changed, 656 insertions(+), 461 deletions(-) create mode 100644 tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninDao.java create mode 100644 tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninFuzzyDao.java create mode 100644 tall/src/main/java/com/ccsens/tall/persist/dao/SigninFieldDao.java diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninDao.java new file mode 100644 index 00000000..0af10adb --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninDao.java @@ -0,0 +1,8 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.ProPluginSigninMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProPluginSigninDao extends ProPluginSigninMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninFuzzyDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninFuzzyDao.java new file mode 100644 index 00000000..a7cc047f --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginSigninFuzzyDao.java @@ -0,0 +1,8 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.ProPluginSigninFuzzyMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProPluginSigninFuzzyDao extends ProPluginSigninFuzzyMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SigninFieldDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SigninFieldDao.java new file mode 100644 index 00000000..1c281a6c --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SigninFieldDao.java @@ -0,0 +1,8 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.SigninFieldMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface SigninFieldDao extends SigninFieldMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index ba8f0ca0..5b995a05 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -138,6 +138,8 @@ public class ExcelService implements IExcelService { saveProTaskSubTime(taskDetails); //读取插件表 readPlugin(xssfWorkbook, taskDetails, proRoles, hasGroupMap); + //读取签到信息表 + wbsSubSheetService.getSigninSheet(sysProject.getId(),xssfWorkbook,taskDetails); return sysProject; } diff --git a/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java b/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java index 963a6dfe..6cdbe9e6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java @@ -15,4 +15,5 @@ public interface IWbsSubSheetService { void getSubTaskMt(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap); + void getSigninSheet(Long projectId,XSSFWorkbook xssfWorkbook, List taskDetails); } diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index 5e06c763..9e388b60 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -132,8 +132,8 @@ public class UserService implements IUserService { theAuth = authList.get(0); } else { SysAuthExample sysAuthExample = new SysAuthExample(); - authExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); - List sysAuthList = authDao.selectByExample(authExample); + sysAuthExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); + List sysAuthList = authDao.selectByExample(sysAuthExample); if(CollectionUtil.isNotEmpty(sysAuthList)){ //添加认证方式 theAuth = new SysAuth(); @@ -195,6 +195,7 @@ public class UserService implements IUserService { private UserVo.UserSign wxLogin(WebConstant.IDENTIFY_TYPE identifyType, String code) throws Exception { UserVo.UserSign userSignVo = null; //获取微信信息并保存 + log.info("公众号登陆，{}",code); WxOauth2UserInfo wxOauth2UserInfo = WxGzhUtil.getOauth2UserInfo(identifyType, code); SysAuth theAuth = null; @@ -207,8 +208,8 @@ public class UserService implements IUserService { theAuth = authList.get(0); } else { SysAuthExample sysAuthExample = new SysAuthExample(); - authExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); - List sysAuthList = authDao.selectByExample(authExample); + sysAuthExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); + List sysAuthList = authDao.selectByExample(sysAuthExample); if(CollectionUtil.isNotEmpty(sysAuthList)){ // SysAuth sysAuth = sysAuthList.get(0); //添加认证方式 @@ -343,18 +344,54 @@ public class UserService implements IUserService { UserVo.UserSign userSignVo = null; //0.获取openid WxXcxUtil.WechatUser wechatUser = WxXcxUtil.getUserInfo(code); - String openid = wechatUser.openid; + String openId = wechatUser.openid; String unionId = wechatUser.unionid; - + log.info("小程序登录，openid:{} ,unionId:{}",openId,unionId); //1.查找对应账户,不存在则注册 List authList = null; SysAuth theAuth = null; SysAuthExample authExample = new SysAuthExample(); authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Wxmp.value) - .andIdentifierEqualTo(openid); + .andIdentifierEqualTo(openId); authList = authDao.selectByExample(authExample); if (CollectionUtil.isEmpty(authList)) { - theAuth = wxRegist(openid, unionId,WebConstant.IDENTIFY_TYPE.Wxmp); + SysAuthExample sysAuthExample = new SysAuthExample(); + sysAuthExample.createCriteria().andCredentialEqualTo(unionId); + List sysAuthList = authDao.selectByExample(sysAuthExample); + if(CollectionUtil.isNotEmpty(sysAuthList)){ +// SysAuth sysAuth = sysAuthList.get(0); + //添加认证方式 + theAuth = new SysAuth(); + theAuth.setId(snowflake.nextId()); + theAuth.setUserId(sysAuthList.get(0).getUserId()); + theAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Wxmp.value); + theAuth.setIdentifier(openId); + theAuth.setCredential(unionId); + authDao.insertSelective(theAuth); + }else { + //新建用户并保存微信信息 + SysUser user = new SysUser(); + user.setId(snowflake.nextId()); + userDao.insertSelective(user); + //添加认证方式 + theAuth = new SysAuth(); + theAuth.setId(snowflake.nextId()); + theAuth.setUserId(user.getId()); + theAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Wxmp.value); + theAuth.setIdentifier(openId); + theAuth.setCredential(unionId); + authDao.insertSelective(theAuth); + //自动添加账号密码 + String accountName = RandomStringUtils.random(8, WebConstant.RANDOM_STR); + SysAuth accountAuth = new SysAuth(); + accountAuth.setId(snowflake.nextId()); + accountAuth.setUserId(user.getId()); + accountAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Account.value); + accountAuth.setIdentifier("USER_" + accountName); + accountAuth.setCredential("123456"); + authDao.insertSelective(accountAuth); + } +// theAuth = wxRegist(openid, unionId,WebConstant.IDENTIFY_TYPE.Wxmp); } else { theAuth = authList.get(0); } diff --git a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java index 2e9736b0..91a108c6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java +++ b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java @@ -6,6 +6,7 @@ import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.persist.dao.*; import com.ccsens.util.CodeEnum; import com.ccsens.util.ExcelUtil; import com.ccsens.util.StringUtil; @@ -18,13 +19,14 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Struct; import java.util.ArrayList; import java.util.List; import java.util.Map; @Service -public class WbsSubSheetService implements IWbsSubSheetService{ +public class WbsSubSheetService implements IWbsSubSheetService { @Autowired private Snowflake snowflake; @Autowired @@ -33,6 +35,17 @@ public class WbsSubSheetService implements IWbsSubSheetService{ private IProTaskDetailService proTaskDetailService; @Autowired private IExcelService excelService; + @Autowired + private SysPluginDao sysPluginDao; + @Autowired + private TaskPluginDao taskPluginDao; + @Autowired + private SigninFieldDao signinFieldDao; + @Autowired + private ProPluginSigninDao proPluginSigninDao; + @Autowired + private ProPluginSigninFuzzyDao pluginSigninFuzzyDao; + /** * 读取子任务表 */ @@ -204,7 +217,14 @@ public class WbsSubSheetService implements IWbsSubSheetService{ } - public void getSigninSheet(XSSFWorkbook xssfWorkbook,List taskDetails){ + /** + * 签到信息表 + * @param projectId + * @param xssfWorkbook + * @param taskDetails + */ + @Override + public void getSigninSheet(Long projectId,XSSFWorkbook xssfWorkbook, List taskDetails) { XSSFSheet signSheet = xssfWorkbook.getSheet("签到信息表"); int fuzzyStart = 0; for (int i = 0; i <= signSheet.getLastRowNum(); i++) { @@ -222,31 +242,137 @@ public class WbsSubSheetService implements IWbsSubSheetService{ fuzzyStart = i + 1; } } - - for (int i = 0; i < fuzzyStart; i++) { - String taskName = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(1)); - String pluginName = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(2)); + Long taskPluginId = null; + String taskName = null; + String pluginName = null; + List proPluginSigninList = new ArrayList<>(); + for (int i = 2; i < fuzzyStart; i++) { + if(StrUtil.isNotEmpty(ExcelUtil.getCellValue(signSheet.getRow(i).getCell(1)))){ + taskName = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(1)); + } + if(StrUtil.isNotEmpty(ExcelUtil.getCellValue(signSheet.getRow(i).getCell(2)))){ + pluginName = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(2)); + } String signName = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(3)); - String isRequired = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(3)); - + String isRequired = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(4)); + //任务下插件的id + if(StrUtil.isNotEmpty(taskName) && StrUtil.isNotEmpty(pluginName)) { + if (ObjectUtil.isNotNull(getTaskPluginId(taskName, pluginName, taskDetails))) { + taskPluginId = getTaskPluginId(taskName, pluginName, taskDetails); + } + } + //签到字段的id + Long signFieldId = null; + if (StrUtil.isNotEmpty(signName)) { + SigninFieldExample signinFieldExample = new SigninFieldExample(); + signinFieldExample.createCriteria().andDescriptionEqualTo(signName); + List fieldList = signinFieldDao.selectByExample(signinFieldExample); + if (CollectionUtil.isNotEmpty(fieldList)) { + signFieldId = fieldList.get(0).getId(); + } + }else { + break; + } + if (ObjectUtil.isNull(taskPluginId)) { + throw new BaseException(CodeEnum.WBS_NOT_PLUGIN); + } + if (ObjectUtil.isNull(signFieldId)) { + throw new BaseException(CodeEnum.NOT_SIGN_FIELD); + } + //新建签到字段和插件的关联表 ProPluginSignin proPluginSignin = new ProPluginSignin(); - - - Long taskDetailId = null; - if(StrUtil.isNotEmpty(taskName) && CollectionUtil.isNotEmpty(taskDetails)){ - for(ProTaskDetail taskDetail : taskDetails){ - if(taskName.equalsIgnoreCase(taskDetail.getName())){ - taskDetailId = taskDetail.getId(); + proPluginSignin.setId(snowflake.nextId()); + proPluginSignin.setTaskPluginId(taskPluginId); + proPluginSignin.setSigninFieldId(signFieldId); + if(StrUtil.isNotEmpty(isRequired)){ + if("是".equalsIgnoreCase(isRequired)){ + proPluginSignin.setIsRequired((byte) 1); + }else if("否".equalsIgnoreCase(isRequired)){ + proPluginSignin.setIsRequired((byte) 0); + } + } + proPluginSigninList.add(proPluginSignin); + proPluginSigninDao.insertSelective(proPluginSignin); + } + //读取模糊查询的信息 + XSSFRow fuzzy = signSheet.getRow(fuzzyStart); + for(int i = 0 ; i fieldList = signinFieldDao.selectByExample(signinFieldExample); + if (CollectionUtil.isNotEmpty(fieldList)) { + signFieldId = fieldList.get(0).getId(); + } + }else { + break; + } + //添加内容 + if(ObjectUtil.isNotNull(signFieldId)) { + //修改关联表，将是否模糊搜索改成“是” + for(ProPluginSignin pluginSignin : proPluginSigninList){ + if(signFieldId.longValue() == pluginSignin.getSigninFieldId().longValue()){ + pluginSignin.setIsFuzzy((byte) 1); + proPluginSigninDao.updateByPrimaryKeySelective(pluginSignin); + break; + } + } + //添加模糊查询内容 + for (int j = fuzzyStart + 1; j < signSheet.getLastRowNum(); j++) { + String description = ExcelUtil.getCellValue(signSheet.getRow(j).getCell(i)); + if (StrUtil.isNotEmpty(description)) { + ProPluginSigninFuzzy signinFuzzy = new ProPluginSigninFuzzy(); + signinFuzzy.setId(snowflake.nextId()); + signinFuzzy.setProjectId(projectId); + signinFuzzy.setSigninFieldId(signFieldId); + signinFuzzy.setDescription(description); + pluginSigninFuzzyDao.insertSelective(signinFuzzy); + }else { break; } } } - if(ObjectUtil.isNotNull(pluginName)){ - SysPluginExample sysPluginExample = new SysPluginExample(); - sysPluginExample.createCriteria().andNameEqualTo(pluginName); - } - } + } + + + private Long getTaskPluginId(String taskDetailName, String sysPluginName, List taskDetails) { + Long taskPluginId = null; + //任务详情id + Long taskDetailId = null; + if (StrUtil.isNotEmpty(taskDetailName) && CollectionUtil.isNotEmpty(taskDetails)) { + for (ProTaskDetail taskDetail : taskDetails) { + if (taskDetailName.equalsIgnoreCase(taskDetail.getName())) { + taskDetailId = taskDetail.getId(); + break; + } + } + } + //插件id + Long sysPluginId = null; + if (ObjectUtil.isNotNull(sysPluginName)) { + SysPluginExample sysPluginExample = new SysPluginExample(); + sysPluginExample.createCriteria().andNameEqualTo(sysPluginName); + List sysPlugins = sysPluginDao.selectByExample(sysPluginExample); + if (CollectionUtil.isNotEmpty(sysPlugins)) { + sysPluginId = sysPlugins.get(0).getId(); + } else { + throw new BaseException(CodeEnum.WBS_NOT_PLUGIN); + } + } + //任务的插件id + if (ObjectUtil.isNotNull(taskDetailId) && ObjectUtil.isNotNull(sysPluginId)) { + ProTaskPluginExample taskPluginExample = new ProTaskPluginExample(); + taskPluginExample.createCriteria().andTaskDetailIdEqualTo(taskDetailId).andPluginIdEqualTo(sysPluginId); + List taskPluginList = taskPluginDao.selectByExample(taskPluginExample); + if (CollectionUtil.isNotEmpty(taskPluginList)) { + taskPluginId = taskPluginList.get(0).getId(); + } + } + return taskPluginId; } } diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 594be799..8117d732 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -91,6 +91,7 @@ public enum CodeEnum { ALREADY_BINDING_PHONE(74,"您已绑定过手机号，请勿重复绑定",true), MERGE_WX_PHONE(75,"该手机号已经注册过账号，是否将账号合并",true), ALREADY_EXIST_ACCOUNT(76,"该账号已存在",true), + NOT_SIGN_FIELD(77,"签到的字段不可用",true) ; public CodeEnum addMsg(String msg){ diff --git a/util/src/main/java/com/ccsens/util/WechatUtil.java b/util/src/main/java/com/ccsens/util/WechatUtil.java index 74d3f2cb..1bfc7513 100644 --- a/util/src/main/java/com/ccsens/util/WechatUtil.java +++ b/util/src/main/java/com/ccsens/util/WechatUtil.java @@ -1,430 +1,430 @@ -//package com.ccsens.util; -// -//import cn.hutool.core.util.ObjectUtil; -//import cn.hutool.core.util.StrUtil; -//import lombok.Data; -//import org.apache.commons.codec.digest.DigestUtils; -// -//import java.io.ByteArrayInputStream; -//import java.io.UnsupportedEncodingException; -//import java.net.ConnectException; -//import java.util.*; -// -//@Data -//class GetUserInfoException extends RuntimeException{ -// private int code; -// public GetUserInfoException(int code,String message){ -// super(message); -// this.code = code; -// } -//} -// -//@Data -//class PayException extends RuntimeException{ -// private int code; -// public PayException(int code,String message){ -// super(message); -// this.code = code; -// } -// -// public PayException(String message){ -// super(message); -// this.code = -1; -// } -//} -// -//public class WechatUtil { -// -// /** -// * 被Jasckson使用的内部类 必须是static的 -// */ -// public static class WechatUser { -// public String openid; -// public String session_key; -// public String unionid; -// public String errcode; -// public String errmsg; -// } -// -// /** -// * Access_Token -// */ -// public static class WechatToken{ -// public String access_token; -// public Long expires_in; -// public String errcode; -// public String errmsg; -// public Date create_at; -// } -// -// /** -// * Get wx code -// */ -// public static class WechatCode{ -// public String scene; -// public String page; -// public Integer width; -// public Boolean auto_color; -// public Boolean line_color; -// public Boolean is_hyaline; -// } -// -// /** -// * Prepare pay -// */ -// public static class PreparePayBean{ -// public String appid;//小程序ID -// public String mch_id;//商户号 -// public String device_info;//设备号 -// public String nonce_str;//随机字符串 -// public String sign;//签名 -// public String sign_type; //签名类型 -// public String body;//商品描述 -// public String detail;//商品详情 -// public String attach;//附加数据 -// public String out_trade_no;//商户订单号 -// public String fee_type;//货币类型 -// public Integer total_fee; //金额(分) -// public String spbill_create_ip;//终端IP -// public String time_start;//交易起始时间 -// public String time_expire;//交易结束时间 -// public String goods_tag;//商品标记 -// public String notify_url;//通知地址 -// public String trade_type;//交易类型 -// public String product_id;//商品id -// public String limit_pay;//指定支付方式 -// public String openid;//用户标识 -// } -// -// /** -// * Prepare pay result -// */ -// public static class PreparePayResultBean{ -// public String return_code; -// public String return_msg; -// public String result_code; -// public String prepay_id; -// public String err_code; -// public String err_code_des; -// } -// -// /** -// * Prepare pay resign -// */ -// public static class PreparePayReSignBean{ -// public String nonceStr; -// public String _package; -// public long timeStamp; -// public String paySign; -// public String signType; -// } -// -// private static final String URL_LOGIN -// = "https://api.weixin.qq.com/sns/jscode2session?appid=%1$s&secret=%2$s&js_code=%3$s&grant_type=%4$s"; -// private static final String URL_GET_ACCESS_TOKEN -// = "https://api.weixin.qq.com/cgi-bin/token?grant_type=%1$s&appid=%2$s&secret=%3$s"; -// private static final String URL_GET_WX_CODE_A -// = "https://api.weixin.qq.com/wxa/getwxacode?access_token=%1$s"; -// private static final String URL_GET_WX_CODE_B -// = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%1$s"; -// private static final String URL_GET_WX_CODE_C -// = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=%1$s"; -// private static final String URL_PREPARE_PAY -// = "https://api.mch.weixin.qq.com/pay/unifiedorder"; -// private static final String URL_PAY_TO_USR_WX -// = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"; -// private static final String URL_PAY_TO_USR_BANK -// = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank"; -// -// private static final String appid = "wx356e01c7eb01d55d"; -// private static final String secret = "83149f3e151d9532f1d2eb76ca10722b"; -// private static final String mchid = "1513955071"; -// private static final String key = "5a689a2d6b8c4ff499c23d998fde0941"; //商户平台key -// -// /** -// * 小程序登陆，根据code获取用户信息(openid,sessionKey,) -// * @param code -// * @return -// * @throws ConnectException -// * @throws Exception -// */ -// public static WechatUser getUserInfo(String code) throws Exception { -// String response = null; -// WechatUser wechatUser = null; -// String url_login = String.format(URL_LOGIN, appid, secret, code, "authorization_code"); -// -// try { -// response = HttpsUtil.httpsRequest(url_login, "GET", null); -// wechatUser = JacksonUtil.jsonToBean(response, WechatUser.class); -// }catch (Exception e){ -// throw new GetUserInfoException(-1,e.getMessage()); -// } -// -// if(wechatUser == null) { -// throw new GetUserInfoException(-1, "Get UserInfoByCode failed."); -// } -// if(!StrUtil.isEmpty(wechatUser.errcode)) { -// throw new GetUserInfoException(Integer.valueOf(wechatUser.errcode), wechatUser.errmsg); -// } -// -// return wechatUser; -// } -// -// /** -// * 获取Access_token -// * @return -// * @throws Exception -// */ -// public static WechatToken getAccessToken() throws Exception { -// String response = null; -// WechatToken wechatToken = null; -// String url = String.format(URL_GET_ACCESS_TOKEN,"client_credential",appid,secret); -// -// response = HttpsUtil.httpsRequest(url,"GET",null); -// if(StrUtil.isEmpty(response)) { -// return null; -// } -// wechatToken = JacksonUtil.jsonToBean(response,WechatToken.class); -// wechatToken.create_at = new Date(); -// return wechatToken; -// } -// -// /** -// * 获取小程序二维码/小程序码 -// * @return -// * @throws Exception -// */ -// public static void getWxCode(String page,String scene,String path) throws Exception { -// WechatToken wechatToken = getAccessToken(); -// String url = String.format(URL_GET_WX_CODE_B,wechatToken.access_token); -// -// WechatCode wechatCode = new WechatCode(); -// wechatCode.page = page; -// wechatCode.scene = scene; -// -// String postStr = JacksonUtil.beanToJson(wechatCode); -// System.out.println(postStr); -// -// HttpsUtil.httpsRequest(url,"POST",postStr,path); -// } -// -// /** -// * 统一下单 -// */ -// public static PreparePayReSignBean preparePay(String openid,String out_trade_no,String body,int total_fee,String spbill_create_ip, -// String notify_url) throws Exception { -// PreparePayBean preparePayBean = new PreparePayBean(); -// preparePayBean.appid = appid; -// preparePayBean.mch_id = mchid; -// preparePayBean.openid = openid; -// preparePayBean.total_fee = total_fee; -// preparePayBean.out_trade_no = out_trade_no; -// preparePayBean.body = new String(body.getBytes("ISO-8859-1"),"UTF-8");//以utf-8编码放入paymentPo，微信支付要求字符编码统一采用UTF-8字符编码 -// //preparePayBean.body = new String("聊天密码小程序-充值"); -// preparePayBean.spbill_create_ip = spbill_create_ip; -// preparePayBean.notify_url = notify_url; -// preparePayBean.trade_type = "JSAPI"; -// preparePayBean.nonce_str = createNonceStr(); -// -// // 把请求参数打包成数组 -// Map sParaTemp = new HashMap(); -// sParaTemp.put("appid", preparePayBean.appid); -// sParaTemp.put("mch_id", preparePayBean.mch_id); -// sParaTemp.put("openid", preparePayBean.openid); -// sParaTemp.put("total_fee",preparePayBean.total_fee + ""); -// sParaTemp.put("out_trade_no", preparePayBean.out_trade_no); -// sParaTemp.put("body", preparePayBean.body); -// sParaTemp.put("spbill_create_ip", preparePayBean.spbill_create_ip); -// sParaTemp.put("notify_url",preparePayBean.notify_url); -// sParaTemp.put("trade_type", preparePayBean.trade_type); -// sParaTemp.put("nonce_str", preparePayBean.nonce_str); -// -// preparePayBean.sign = createSign(sParaTemp); -// -// String reqrXml = JacksonUtil.beanToXml(preparePayBean,"xml"); -// String respXml = HttpsUtil.httpsRequest(URL_PREPARE_PAY,"POST",reqrXml); -// -// System.out.println("---------------PreparePay Request Xml-----------------"); -// System.out.println(reqrXml); -// System.out.println("---------------PreparePay Response Xml-----------------"); -// System.out.println(respXml); -// System.out.println("---------------PreparePay end-----------------"); -// -// PreparePayResultBean resultBean = null; -// PreparePayReSignBean reSignBean = new PreparePayReSignBean(); -// resultBean = JacksonUtil.xmlToBean(new ByteArrayInputStream(respXml.getBytes()),PreparePayResultBean.class); -// -// if(ObjectUtil.isNull(resultBean)) { -// throw new PayException("PreparePay 返回的resultBean为空"); -// } -// -// if(!StrUtil.isEmpty(resultBean.return_code) -// && !StrUtil.isEmpty(resultBean.result_code)){ -// if(resultBean.result_code.equals("SUCCESS") && resultBean.return_code.equals(resultBean.result_code)){ -// reSignBean.nonceStr = createNonceStr(); -// reSignBean._package = "prepay_id="+resultBean.prepay_id; -// reSignBean.timeStamp = System.currentTimeMillis() / 1000; -// reSignBean.signType = "MD5"; -// -// // 把请求参数打包成数组 -// sParaTemp = new HashMap(); -// sParaTemp.put("appId", appid); -// sParaTemp.put("package", reSignBean._package); -// sParaTemp.put("nonceStr", reSignBean.nonceStr); -// sParaTemp.put("signType", reSignBean.signType); -// sParaTemp.put("timeStamp",reSignBean.timeStamp + ""); -// -// reSignBean.paySign = createSign(sParaTemp); -// -// return reSignBean; -// }else{ -// throw new PayException("[" + resultBean.err_code + "]" -// + resultBean.err_code_des); -// } -// }else { -// throw new PayException(resultBean.return_msg); -// } -// //return null; -// } -// -// /** -// * Create Sign -// * @param sParaTemp -// * @return -// */ -// public static String createSign(Map sParaTemp){ -// // 除去数组中的空值和签名参数 -// Map sPara = paraFilter(sParaTemp); -// String prestr = createLinkString(sPara); // 把数组所有元素，按照“参数=参数值”的模式用“&”字符拼接成字符串 -// //MD5运算生成签名 -// String sign = sign(prestr, key, "utf-8").toUpperCase(); -// return sign; -// } -// -// /** -// * 除去数组中的空值和签名参数 -// * @param sArray 签名参数组 -// * @return 去掉空值与签名参数后的新签名参数组 -// */ -// private static Map paraFilter(Map sArray) { -// Map result = new HashMap(); -// if (sArray == null || sArray.size() <= 0) { -// return result; -// } -// for (String key : sArray.keySet()) { -// String value = "" + sArray.get(key); -// if (StrUtil.isEmpty(value) || key.equalsIgnoreCase("sign") || key.equalsIgnoreCase("sign_type")) { -// continue; -// } -// result.put(key, value); -// } -// return result; -// } -// -// /** -// * 把数组所有元素排序，并按照“参数=参数值”的模式用“&”字符拼接成字符串 -// * @param params 需要排序并参与字符拼接的参数组 -// * @return 拼接后字符串 -// */ -// private static String createLinkString(Map params) { -// List keys = new ArrayList(params.keySet()); -// Collections.sort(keys); -// String prestr = ""; -// for (int i = 0; i < keys.size(); i++) { -// String key = keys.get(i); -// String value = params.get(key); -// if (i == keys.size() - 1) {// 拼接时，不包括最后一个&字符 -// prestr = prestr + key + "=" + value; -// } else { -// prestr = prestr + key + "=" + value + "&"; -// } -// } -// return prestr; -// } -// -// /** -// * 签名字符串 -// * @param text 需要签名的字符串 -// * @param key 密钥 -// * @param input_charset 编码格式 -// * @return 签名结果 -// */ -// private static String sign(String text, String key, String input_charset) { -// text = text + "&key=" + key; -// return DigestUtils.md5Hex(getContentBytes(text, input_charset)); -// } -// -// /** -// * @param content -// * @param charset -// * @return -// * @throws -// * @throws UnsupportedEncodingException -// */ -// private static byte[] getContentBytes(String content, String charset) { -// if (charset == null || "".equals(charset)) { -// return content.getBytes(); -// } -// try { -// return content.getBytes(charset); -// } catch (UnsupportedEncodingException e) { -// throw new RuntimeException("MD5签名过程中出现错误,指定的编码集不对,您目前指定的编码集是:" + charset); -// } -// } -// -// private static String createNonceStr(){ -// return UUID.randomUUID().toString().replace("-",""); -// } -// -// public static Map payToUsrWx( -// String partner_trade_no,String openid,int total_fee,String desc,String spbill_create_ip) -// throws Exception{ -// //1.构造请求字符串 -// Map reqMap = new HashMap(); -// reqMap.put("mch_appid",appid); -// reqMap.put("mchid",mchid); -// //reqMap.put("device_info",null); //不能添加空字段，Jackson会生成闭包xml 导致签名失败 -// reqMap.put("nonce_str",createNonceStr()); -// reqMap.put("partner_trade_no",partner_trade_no); -// reqMap.put("openid",openid); -// reqMap.put("check_name","NO_CHECK"); -// //reqMap.put("re_user_name",null); -// reqMap.put("amount",total_fee + ""); -// reqMap.put("desc",desc); -// reqMap.put("spbill_create_ip",spbill_create_ip); -// reqMap.put("sign",createSign(reqMap)); -// -// //2.发送付款请求 -// String reqrXml = JacksonUtil.mapToXml(reqMap,"xml"); -// String respXml = HttpsUtil.httpsRequest(URL_PAY_TO_USR_WX,"POST",reqrXml, -// WebConstant.PATH_WX_CRET,mchid); -// System.out.println("---------------PayToUsrWx Request Xml-----------------"); -// System.out.println(reqrXml); -// System.out.println("---------------PayToUsrWx Response Xml-----------------"); -// System.out.println(respXml); -// System.out.println("---------------PayToUsrWx end-----------------"); -// -// //3.判断成功失败 -// Map respMap = JacksonUtil.xmlToMap(new ByteArrayInputStream(respXml.getBytes())); -// String return_code,result_code; -// return_code = (String) respMap.get("return_code"); -// result_code = (String) respMap.get("result_code"); -// -// if(!StrUtil.isEmpty(return_code) && !StrUtil.isEmpty(result_code)){ -// if(return_code.equals("SUCCESS") && return_code.equals(result_code)){ -// return respMap; -// }else{ -// throw new PayException("[" + respMap.get("err_code") + "]" -// + respMap.get("err_code_des")); -// } -// }else { -// throw new PayException((String) respMap.get("return_msg")); -// } -// //return null; -// } -// -// public static Map payToUsrBank(){ -// //Fix Me -// return null; -// } -//} +package com.ccsens.util; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import lombok.Data; +import org.apache.commons.codec.digest.DigestUtils; + +import java.io.ByteArrayInputStream; +import java.io.UnsupportedEncodingException; +import java.net.ConnectException; +import java.util.*; + +@Data +class GetUserInfoException extends RuntimeException{ + private int code; + public GetUserInfoException(int code,String message){ + super(message); + this.code = code; + } +} + +@Data +class PayException extends RuntimeException{ + private int code; + public PayException(int code,String message){ + super(message); + this.code = code; + } + + public PayException(String message){ + super(message); + this.code = -1; + } +} + +public class WechatUtil { + + /** + * 被Jasckson使用的内部类 必须是static的 + */ + public static class WechatUser { + public String openid; + public String session_key; + public String unionid; + public String errcode; + public String errmsg; + } + + /** + * Access_Token + */ + public static class WechatToken{ + public String access_token; + public Long expires_in; + public String errcode; + public String errmsg; + public Date create_at; + } + + /** + * Get wx code + */ + public static class WechatCode{ + public String scene; + public String page; + public Integer width; + public Boolean auto_color; + public Boolean line_color; + public Boolean is_hyaline; + } + + /** + * Prepare pay + */ + public static class PreparePayBean{ + public String appid;//小程序ID + public String mch_id;//商户号 + public String device_info;//设备号 + public String nonce_str;//随机字符串 + public String sign;//签名 + public String sign_type; //签名类型 + public String body;//商品描述 + public String detail;//商品详情 + public String attach;//附加数据 + public String out_trade_no;//商户订单号 + public String fee_type;//货币类型 + public Integer total_fee; //金额(分) + public String spbill_create_ip;//终端IP + public String time_start;//交易起始时间 + public String time_expire;//交易结束时间 + public String goods_tag;//商品标记 + public String notify_url;//通知地址 + public String trade_type;//交易类型 + public String product_id;//商品id + public String limit_pay;//指定支付方式 + public String openid;//用户标识 + } + + /** + * Prepare pay result + */ + public static class PreparePayResultBean{ + public String return_code; + public String return_msg; + public String result_code; + public String prepay_id; + public String err_code; + public String err_code_des; + } + + /** + * Prepare pay resign + */ + public static class PreparePayReSignBean{ + public String nonceStr; + public String _package; + public long timeStamp; + public String paySign; + public String signType; + } + + private static final String URL_LOGIN + = "https://api.weixin.qq.com/sns/jscode2session?appid=%1$s&secret=%2$s&js_code=%3$s&grant_type=%4$s"; + private static final String URL_GET_ACCESS_TOKEN + = "https://api.weixin.qq.com/cgi-bin/token?grant_type=%1$s&appid=%2$s&secret=%3$s"; + private static final String URL_GET_WX_CODE_A + = "https://api.weixin.qq.com/wxa/getwxacode?access_token=%1$s"; + private static final String URL_GET_WX_CODE_B + = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%1$s"; + private static final String URL_GET_WX_CODE_C + = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=%1$s"; + private static final String URL_PREPARE_PAY + = "https://api.mch.weixin.qq.com/pay/unifiedorder"; + private static final String URL_PAY_TO_USR_WX + = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"; + private static final String URL_PAY_TO_USR_BANK + = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank"; + + private static final String appid = "wx356e01c7eb01d55d"; + private static final String secret = "83149f3e151d9532f1d2eb76ca10722b"; + private static final String mchid = "1513955071"; + private static final String key = "5a689a2d6b8c4ff499c23d998fde0941"; //商户平台key + + /** + * 小程序登陆，根据code获取用户信息(openid,sessionKey,) + * @param code + * @return + * @throws ConnectException + * @throws Exception + */ + public static WechatUser getUserInfo(String code) throws Exception { + String response = null; + WechatUser wechatUser = null; + String url_login = String.format(URL_LOGIN, appid, secret, code, "authorization_code"); + + try { + response = HttpsUtil.httpsRequest(url_login, "GET", null); + wechatUser = JacksonUtil.jsonToBean(response, WechatUser.class); + }catch (Exception e){ + throw new GetUserInfoException(-1,e.getMessage()); + } + + if(wechatUser == null) { + throw new GetUserInfoException(-1, "Get UserInfoByCode failed."); + } + if(!StrUtil.isEmpty(wechatUser.errcode)) { + throw new GetUserInfoException(Integer.valueOf(wechatUser.errcode), wechatUser.errmsg); + } + + return wechatUser; + } + + /** + * 获取Access_token + * @return + * @throws Exception + */ + public static WechatToken getAccessToken() throws Exception { + String response = null; + WechatToken wechatToken = null; + String url = String.format(URL_GET_ACCESS_TOKEN,"client_credential",appid,secret); + + response = HttpsUtil.httpsRequest(url,"GET",null); + if(StrUtil.isEmpty(response)) { + return null; + } + wechatToken = JacksonUtil.jsonToBean(response,WechatToken.class); + wechatToken.create_at = new Date(); + return wechatToken; + } + + /** + * 获取小程序二维码/小程序码 + * @return + * @throws Exception + */ + public static void getWxCode(String page,String scene,String path) throws Exception { + WechatToken wechatToken = getAccessToken(); + String url = String.format(URL_GET_WX_CODE_B,wechatToken.access_token); + + WechatCode wechatCode = new WechatCode(); + wechatCode.page = page; + wechatCode.scene = scene; + + String postStr = JacksonUtil.beanToJson(wechatCode); + System.out.println(postStr); + + HttpsUtil.httpsRequest(url,"POST",postStr,path); + } + + /** + * 统一下单 + */ + public static PreparePayReSignBean preparePay(String openid,String out_trade_no,String body,int total_fee,String spbill_create_ip, + String notify_url) throws Exception { + PreparePayBean preparePayBean = new PreparePayBean(); + preparePayBean.appid = appid; + preparePayBean.mch_id = mchid; + preparePayBean.openid = openid; + preparePayBean.total_fee = total_fee; + preparePayBean.out_trade_no = out_trade_no; + preparePayBean.body = new String(body.getBytes("ISO-8859-1"),"UTF-8");//以utf-8编码放入paymentPo，微信支付要求字符编码统一采用UTF-8字符编码 + //preparePayBean.body = new String("聊天密码小程序-充值"); + preparePayBean.spbill_create_ip = spbill_create_ip; + preparePayBean.notify_url = notify_url; + preparePayBean.trade_type = "JSAPI"; + preparePayBean.nonce_str = createNonceStr(); + + // 把请求参数打包成数组 + Map sParaTemp = new HashMap(); + sParaTemp.put("appid", preparePayBean.appid); + sParaTemp.put("mch_id", preparePayBean.mch_id); + sParaTemp.put("openid", preparePayBean.openid); + sParaTemp.put("total_fee",preparePayBean.total_fee + ""); + sParaTemp.put("out_trade_no", preparePayBean.out_trade_no); + sParaTemp.put("body", preparePayBean.body); + sParaTemp.put("spbill_create_ip", preparePayBean.spbill_create_ip); + sParaTemp.put("notify_url",preparePayBean.notify_url); + sParaTemp.put("trade_type", preparePayBean.trade_type); + sParaTemp.put("nonce_str", preparePayBean.nonce_str); + + preparePayBean.sign = createSign(sParaTemp); + + String reqrXml = JacksonUtil.beanToXml(preparePayBean,"xml"); + String respXml = HttpsUtil.httpsRequest(URL_PREPARE_PAY,"POST",reqrXml); + + System.out.println("---------------PreparePay Request Xml-----------------"); + System.out.println(reqrXml); + System.out.println("---------------PreparePay Response Xml-----------------"); + System.out.println(respXml); + System.out.println("---------------PreparePay end-----------------"); + + PreparePayResultBean resultBean = null; + PreparePayReSignBean reSignBean = new PreparePayReSignBean(); + resultBean = JacksonUtil.xmlToBean(new ByteArrayInputStream(respXml.getBytes()),PreparePayResultBean.class); + + if(ObjectUtil.isNull(resultBean)) { + throw new PayException("PreparePay 返回的resultBean为空"); + } + + if(!StrUtil.isEmpty(resultBean.return_code) + && !StrUtil.isEmpty(resultBean.result_code)){ + if(resultBean.result_code.equals("SUCCESS") && resultBean.return_code.equals(resultBean.result_code)){ + reSignBean.nonceStr = createNonceStr(); + reSignBean._package = "prepay_id="+resultBean.prepay_id; + reSignBean.timeStamp = System.currentTimeMillis() / 1000; + reSignBean.signType = "MD5"; + + // 把请求参数打包成数组 + sParaTemp = new HashMap(); + sParaTemp.put("appId", appid); + sParaTemp.put("package", reSignBean._package); + sParaTemp.put("nonceStr", reSignBean.nonceStr); + sParaTemp.put("signType", reSignBean.signType); + sParaTemp.put("timeStamp",reSignBean.timeStamp + ""); + + reSignBean.paySign = createSign(sParaTemp); + + return reSignBean; + }else{ + throw new PayException("[" + resultBean.err_code + "]" + + resultBean.err_code_des); + } + }else { + throw new PayException(resultBean.return_msg); + } + //return null; + } + + /** + * Create Sign + * @param sParaTemp + * @return + */ + public static String createSign(Map sParaTemp){ + // 除去数组中的空值和签名参数 + Map sPara = paraFilter(sParaTemp); + String prestr = createLinkString(sPara); // 把数组所有元素，按照“参数=参数值”的模式用“&”字符拼接成字符串 + //MD5运算生成签名 + String sign = sign(prestr, key, "utf-8").toUpperCase(); + return sign; + } + + /** + * 除去数组中的空值和签名参数 + * @param sArray 签名参数组 + * @return 去掉空值与签名参数后的新签名参数组 + */ + private static Map paraFilter(Map sArray) { + Map result = new HashMap(); + if (sArray == null || sArray.size() <= 0) { + return result; + } + for (String key : sArray.keySet()) { + String value = "" + sArray.get(key); + if (StrUtil.isEmpty(value) || key.equalsIgnoreCase("sign") || key.equalsIgnoreCase("sign_type")) { + continue; + } + result.put(key, value); + } + return result; + } + + /** + * 把数组所有元素排序，并按照“参数=参数值”的模式用“&”字符拼接成字符串 + * @param params 需要排序并参与字符拼接的参数组 + * @return 拼接后字符串 + */ + private static String createLinkString(Map params) { + List keys = new ArrayList(params.keySet()); + Collections.sort(keys); + String prestr = ""; + for (int i = 0; i < keys.size(); i++) { + String key = keys.get(i); + String value = params.get(key); + if (i == keys.size() - 1) {// 拼接时，不包括最后一个&字符 + prestr = prestr + key + "=" + value; + } else { + prestr = prestr + key + "=" + value + "&"; + } + } + return prestr; + } + + /** + * 签名字符串 + * @param text 需要签名的字符串 + * @param key 密钥 + * @param input_charset 编码格式 + * @return 签名结果 + */ + private static String sign(String text, String key, String input_charset) { + text = text + "&key=" + key; + return DigestUtils.md5Hex(getContentBytes(text, input_charset)); + } + + /** + * @param content + * @param charset + * @return + * @throws + * @throws UnsupportedEncodingException + */ + private static byte[] getContentBytes(String content, String charset) { + if (charset == null || "".equals(charset)) { + return content.getBytes(); + } + try { + return content.getBytes(charset); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("MD5签名过程中出现错误,指定的编码集不对,您目前指定的编码集是:" + charset); + } + } + + private static String createNonceStr(){ + return UUID.randomUUID().toString().replace("-",""); + } + + public static Map payToUsrWx( + String partner_trade_no,String openid,int total_fee,String desc,String spbill_create_ip) + throws Exception{ + //1.构造请求字符串 + Map reqMap = new HashMap(); + reqMap.put("mch_appid",appid); + reqMap.put("mchid",mchid); + //reqMap.put("device_info",null); //不能添加空字段，Jackson会生成闭包xml 导致签名失败 + reqMap.put("nonce_str",createNonceStr()); + reqMap.put("partner_trade_no",partner_trade_no); + reqMap.put("openid",openid); + reqMap.put("check_name","NO_CHECK"); + //reqMap.put("re_user_name",null); + reqMap.put("amount",total_fee + ""); + reqMap.put("desc",desc); + reqMap.put("spbill_create_ip",spbill_create_ip); + reqMap.put("sign",createSign(reqMap)); + + //2.发送付款请求 + String reqrXml = JacksonUtil.mapToXml(reqMap,"xml"); + String respXml = HttpsUtil.httpsRequest(URL_PAY_TO_USR_WX,"POST",reqrXml, + WebConstant.PATH_WX_CRET,mchid); + System.out.println("---------------PayToUsrWx Request Xml-----------------"); + System.out.println(reqrXml); + System.out.println("---------------PayToUsrWx Response Xml-----------------"); + System.out.println(respXml); + System.out.println("---------------PayToUsrWx end-----------------"); + + //3.判断成功失败 + Map respMap = JacksonUtil.xmlToMap(new ByteArrayInputStream(respXml.getBytes())); + String return_code,result_code; + return_code = (String) respMap.get("return_code"); + result_code = (String) respMap.get("result_code"); + + if(!StrUtil.isEmpty(return_code) && !StrUtil.isEmpty(result_code)){ + if(return_code.equals("SUCCESS") && return_code.equals(result_code)){ + return respMap; + }else{ + throw new PayException("[" + respMap.get("err_code") + "]" + + respMap.get("err_code_des")); + } + }else { + throw new PayException((String) respMap.get("return_msg")); + } + //return null; + } + + public static Map payToUsrBank(){ + //Fix Me + return null; + } +} diff --git a/util/src/main/java/com/ccsens/util/WordToJpgUtil.java b/util/src/main/java/com/ccsens/util/WordToJpgUtil.java index 6f469467..c1e78216 100644 --- a/util/src/main/java/com/ccsens/util/WordToJpgUtil.java +++ b/util/src/main/java/com/ccsens/util/WordToJpgUtil.java @@ -1,4 +1,4 @@ -package com.ccsens.util;//package com.ccsens.ptpro.util; +//package com.ccsens.util;//package com.ccsens.ptpro.util; // //import com.artofsolving.jodconverter.DocumentConverter; //import com.artofsolving.jodconverter.openoffice.connection.OpenOfficeConnection; diff --git a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java index 52f9b9ac..02d3bb41 100644 --- a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java +++ b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java @@ -138,8 +138,12 @@ public class WxXcxUtil { private static final String URL_CREATE_MENU = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=%1$s"; - private static final String appid = "wx7af1bf1e14facf82"; - private static final String secret = "a6613fae11b497639c0224b820aaf6d9"; +// private static final String appid = "wx7af1bf1e14facf82"; +// private static final String secret = "a6613fae11b497639c0224b820aaf6d9"; + + private static final String appid = "wx356e01c7eb01d55d"; + private static final String secret = "05c5204867d92a0ec7e7a44c9d95338b"; + private static final String mchid = ""; private static final String key = ""; From 159467aa648b5f90895e859a67aa007ecbe2c7f5 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Fri, 17 Jan 2020 17:50:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudutil/bean/tall/vo/PluginVo.java | 28 +++++++ .../cloudutil/feign/TallFeignClient.java | 12 +++ .../com/ccsens/mt/api/SigninController.java | 41 ++++++++-- .../com/ccsens/mt/bean/po/MtSigninOther.java | 12 +-- .../mt/bean/po/MtSigninOtherExample.java | 48 ++++++------ .../java/com/ccsens/mt/bean/vo/SigninVo.java | 32 ++++++++ .../mt/persist/dao/MtSigninBasicDao.java | 8 ++ .../mt/persist/dao/MtSigninOtherDao.java | 8 ++ .../com/ccsens/mt/service/ISigninService.java | 2 + .../com/ccsens/mt/service/SigninService.java | 75 ++++++++++++++++++- .../mapper_raw/MtSigninOtherMapper.xml | 28 +++---- .../com/ccsens/tall/bean/vo/PluginVo.java | 19 +++++ .../tall/service/ISysPluginService.java | 2 + .../ccsens/tall/service/SysPluginService.java | 45 +++++++++++ .../com/ccsens/tall/web/PluginController.java | 12 +++ 15 files changed, 319 insertions(+), 53 deletions(-) create mode 100644 cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/PluginVo.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninBasicDao.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninOtherDao.java diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/PluginVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/PluginVo.java new file mode 100644 index 00000000..cbca1190 --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/PluginVo.java @@ -0,0 +1,28 @@ +package com.ccsens.cloudutil.bean.tall.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PluginVo { + + @ApiModel + @Data + public static class PluginSignField{ + @ApiModelProperty("变量名") + private String name; + @ApiModelProperty("展示名") + private String description; + @ApiModelProperty("类型 0文本 1文本框 2单选 3多选") + private int type; + @ApiModelProperty("类型值（文本，单选，多选，展示的内容 例：｛\"1\":\"男\",\"2\":\"女\"｝，）") + private String fieldValue; + @ApiModelProperty("正则表达式") + private String format; + @ApiModelProperty("是否必填") + private int isRequired; + @ApiModelProperty("是否支持模糊查询") + private int isFuzzy; + } +} diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 4e1acc77..539a4d15 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -5,6 +5,7 @@ import com.ccsens.cloudutil.bean.tall.dto.LogDto; import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; import com.ccsens.cloudutil.bean.tall.dto.UserDto; import com.ccsens.cloudutil.bean.tall.vo.MemberVo; +import com.ccsens.cloudutil.bean.tall.vo.PluginVo; import com.ccsens.cloudutil.bean.tall.vo.TaskVo; import com.ccsens.cloudutil.bean.tall.vo.UserVo; import com.ccsens.util.JsonResponse; @@ -109,6 +110,12 @@ public interface TallFeignClient { @GetMapping("/users/claims") String getUserId(@RequestParam( name = "token")String token); + /** + * 通过插件id获取签到字段和详细信息 + */ + @GetMapping("/plugins/sign") + List getSignFieldByTaskPluginId(Long taskPluginId); + } @Slf4j @@ -171,6 +178,11 @@ class TallFeignClientFallBack implements FallbackFactory { public String getUserId(String token) { return null; } + + @Override + public List getSignFieldByTaskPluginId(Long taskPluginId){ + return null; + } }; } diff --git a/mt/src/main/java/com/ccsens/mt/api/SigninController.java b/mt/src/main/java/com/ccsens/mt/api/SigninController.java index 202f5800..39490ac3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/SigninController.java +++ b/mt/src/main/java/com/ccsens/mt/api/SigninController.java @@ -26,20 +26,47 @@ public class SigninController { @Autowired private ISigninService signinService; - @ApiOperation(value = "签到", notes = "") + @ApiOperation(value = "查看签到需要的信息", notes = "") @ApiImplicitParams({ }) - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse signin(HttpServletRequest request, - @ApiParam @Validated @RequestBody SigninDto.SigninInfo signinInfo) throws Exception { - log.info("{}:签到"); + @RequestMapping(value = "info", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getSignField(HttpServletRequest request, + @ApiParam @Validated @RequestBody Long taskPluginId) throws Exception { + log.info("{}:查看签到需要填的信息"); //获取userId Long userId = userService.getUserIdByToken(request); - SigninVo.SigninVoInfo signinVoInfo = signinService.signin(signinInfo,userId); + SigninVo.SignInfoVo signInfoVo = signinService.getSignField(taskPluginId,userId); - return JsonResponse.newInstance().ok(signinVoInfo); + return JsonResponse.newInstance().ok(signInfoVo); } +// @ApiOperation(value = "模糊查询签到信息", notes = "") +// @ApiImplicitParams({ +// }) +// @RequestMapping(value = "fuzzy", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse getSignByFuzzy(HttpServletRequest request, +// @ApiParam @Validated @RequestBody Long projectId,String signinName,String key) throws Exception { +// log.info("{}:查看签到需要填的信息"); +// //获取userId +// Long userId = userService.getUserIdByToken(request); +// +// return JsonResponse.newInstance().ok(signInfoVo); +// } + +// @ApiOperation(value = "签到", notes = "") +// @ApiImplicitParams({ +// }) +// @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse signin(HttpServletRequest request, +// @ApiParam @Validated @RequestBody SigninDto.SigninInfo signinInfo) throws Exception { +// log.info("{}:签到"); +// //获取userId +// Long userId = userService.getUserIdByToken(request); +// SigninVo.SigninVoInfo signinVoInfo = signinService.signin(signinInfo,userId); +// +// return JsonResponse.newInstance().ok(signinVoInfo); +// } + @ApiOperation(value = "查看自己的签到信息", notes = "") @ApiImplicitParams({ @ApiImplicitParam(name = "taskId", value = "签到任务的id", required = true, paramType = ""), diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOther.java b/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOther.java index 66a1a183..2471cd09 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOther.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOther.java @@ -6,7 +6,7 @@ import java.util.Date; public class MtSigninOther implements Serializable { private Long id; - private Long userId; + private Long signinBasicId; private String key; @@ -28,12 +28,12 @@ public class MtSigninOther implements Serializable { this.id = id; } - public Long getUserId() { - return userId; + public Long getSigninBasicId() { + return signinBasicId; } - public void setUserId(Long userId) { - this.userId = userId; + public void setSigninBasicId(Long signinBasicId) { + this.signinBasicId = signinBasicId; } public String getKey() { @@ -83,7 +83,7 @@ public class MtSigninOther implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", userId=").append(userId); + sb.append(", signinBasicId=").append(signinBasicId); sb.append(", key=").append(key); sb.append(", value=").append(value); sb.append(", createdAt=").append(createdAt); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOtherExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOtherExample.java index 784aa8e0..e3d34779 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOtherExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/MtSigninOtherExample.java @@ -165,63 +165,63 @@ public class MtSigninOtherExample { return (Criteria) this; } - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); + public Criteria andSigninBasicIdIsNull() { + addCriterion("signin_basic_id is null"); return (Criteria) this; } - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); + public Criteria andSigninBasicIdIsNotNull() { + addCriterion("signin_basic_id is not null"); return (Criteria) this; } - public Criteria andUserIdEqualTo(Long value) { - addCriterion("user_id =", value, "userId"); + public Criteria andSigninBasicIdEqualTo(Long value) { + addCriterion("signin_basic_id =", value, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdNotEqualTo(Long value) { - addCriterion("user_id <>", value, "userId"); + public Criteria andSigninBasicIdNotEqualTo(Long value) { + addCriterion("signin_basic_id <>", value, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdGreaterThan(Long value) { - addCriterion("user_id >", value, "userId"); + public Criteria andSigninBasicIdGreaterThan(Long value) { + addCriterion("signin_basic_id >", value, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("user_id >=", value, "userId"); + public Criteria andSigninBasicIdGreaterThanOrEqualTo(Long value) { + addCriterion("signin_basic_id >=", value, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdLessThan(Long value) { - addCriterion("user_id <", value, "userId"); + public Criteria andSigninBasicIdLessThan(Long value) { + addCriterion("signin_basic_id <", value, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdLessThanOrEqualTo(Long value) { - addCriterion("user_id <=", value, "userId"); + public Criteria andSigninBasicIdLessThanOrEqualTo(Long value) { + addCriterion("signin_basic_id <=", value, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); + public Criteria andSigninBasicIdIn(List values) { + addCriterion("signin_basic_id in", values, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); + public Criteria andSigninBasicIdNotIn(List values) { + addCriterion("signin_basic_id not in", values, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdBetween(Long value1, Long value2) { - addCriterion("user_id between", value1, value2, "userId"); + public Criteria andSigninBasicIdBetween(Long value1, Long value2) { + addCriterion("signin_basic_id between", value1, value2, "signinBasicId"); return (Criteria) this; } - public Criteria andUserIdNotBetween(Long value1, Long value2) { - addCriterion("user_id not between", value1, value2, "userId"); + public Criteria andSigninBasicIdNotBetween(Long value1, Long value2) { + addCriterion("signin_basic_id not between", value1, value2, "signinBasicId"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/SigninVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/SigninVo.java index 3d511f07..f4202bcc 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/SigninVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/SigninVo.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class SigninVo { @Data @@ -18,4 +20,34 @@ public class SigninVo { @ApiModelProperty("签到时间") private Long signTime; } + + @Data + @ApiModel + public static class SignInfoVo{ + @ApiModelProperty("是否已签到 0未签到 1已签到") + private Integer isSign; + @ApiModelProperty("签到时间") + private Long signTime; + @ApiModelProperty("序号") + private int sequence; + @ApiModelProperty("签到字段") + private List signField; + } + @Data + @ApiModel + public static class SignField{ + @ApiModelProperty("字段名") + private String name; + @ApiModelProperty("内容") + private String value; + @ApiModelProperty("类型 0文本，1文本框，2单选，3多选") + private int type; + @ApiModelProperty("类型值（文本，单选，多选，展示的内容 例：｛\"1\":\"男\",\"2\":\"女\"｝）") + private String field; + @ApiModelProperty("是否必填") + private int isRequired; + @ApiModelProperty("是否支持模糊查询") + private int isFuzzy; + + } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninBasicDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninBasicDao.java new file mode 100644 index 00000000..9c70475c --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninBasicDao.java @@ -0,0 +1,8 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.persist.mapper.MtSigninBasicMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface MtSigninBasicDao extends MtSigninBasicMapper { +} diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninOtherDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninOtherDao.java new file mode 100644 index 00000000..715b6430 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/MtSigninOtherDao.java @@ -0,0 +1,8 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.persist.mapper.MtSigninOtherMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface MtSigninOtherDao extends MtSigninOtherMapper { +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ISigninService.java b/mt/src/main/java/com/ccsens/mt/service/ISigninService.java index 5dc39f74..e9a2762e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ISigninService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ISigninService.java @@ -11,4 +11,6 @@ public interface ISigninService { SigninVo.SigninVoInfo getSignByTaskId(Long taskId, Long userId); List getSignAllByTaskId(Long taskId, Long userId); + + SigninVo.SignInfoVo getSignField(Long taskPluginId, Long userId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/SigninService.java b/mt/src/main/java/com/ccsens/mt/service/SigninService.java index 7b1cd8c0..3133de81 100644 --- a/mt/src/main/java/com/ccsens/mt/service/SigninService.java +++ b/mt/src/main/java/com/ccsens/mt/service/SigninService.java @@ -2,11 +2,15 @@ package com.ccsens.mt.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.cloudutil.bean.tall.vo.PluginVo; +import com.ccsens.cloudutil.feign.TallFeignClient; import com.ccsens.mt.bean.dto.SigninDto; -import com.ccsens.mt.bean.po.MtSignin; -import com.ccsens.mt.bean.po.MtSigninExample; +import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.SigninVo; +import com.ccsens.mt.persist.dao.MtSigninBasicDao; import com.ccsens.mt.persist.dao.MtSigninDao; +import com.ccsens.mt.persist.dao.MtSigninOtherDao; import com.ccsens.util.CodeEnum; import com.ccsens.util.exception.BaseException; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +25,73 @@ public class SigninService implements ISigninService{ private MtSigninDao mtSigninDao; @Autowired private Snowflake snowflake; + @Autowired + private MtSigninBasicDao signinBasicDao; + @Autowired + private MtSigninOtherDao signinOtherDao; + @Autowired + private TallFeignClient tallFeignClient; + + + /** + * 查看签到所需信息 + * @param taskPluginId + * @param userId + * @return + */ + @Override + public SigninVo.SignInfoVo getSignField(Long taskPluginId, Long userId) { + SigninVo.SignInfoVo signInfoVo = new SigninVo.SignInfoVo(); + //1.判断用户是否已签到 + MtSigninBasicExample signinBasicExample = new MtSigninBasicExample(); + signinBasicExample.createCriteria().andUserIdEqualTo(userId).andTaskPluginIdEqualTo(taskPluginId); + List signinBasicList = signinBasicDao.selectByExample(signinBasicExample); + if(CollectionUtil.isNotEmpty(signinBasicList)){ + MtSigninBasic mtSigninBasic = signinBasicList.get(0); + //已签到，返回签到的信息 + List signFieldList = new ArrayList<>(); + MtSigninOtherExample signinOtherExample = new MtSigninOtherExample(); + signinOtherExample.createCriteria().andSigninBasicIdEqualTo(mtSigninBasic.getId()); + List signinOtherList = signinOtherDao.selectByExample(signinOtherExample); + if(CollectionUtil.isNotEmpty(signinOtherList)){ + for (MtSigninOther signinOther : signinOtherList){ + SigninVo.SignField signField = new SigninVo.SignField(); + signField.setName(signinOther.getKey()); + signField.setValue(signinOther.getValue()); + signFieldList.add(signField); + } + } + + signInfoVo.setIsSign(1); + signInfoVo.setSequence(mtSigninBasic.getSequence()); + signInfoVo.setSignTime(mtSigninBasic.getSigninTime()); + signInfoVo.setSignField(signFieldList); + }else{ + //获取字段详细的信息 + List signFieldList = new ArrayList<>(); + List pluginSignFieldList = tallFeignClient.getSignFieldByTaskPluginId(taskPluginId); + if(CollectionUtil.isNotEmpty(pluginSignFieldList)){ + for(PluginVo.PluginSignField pluginSignField : pluginSignFieldList) { + SigninVo.SignField signField = new SigninVo.SignField(); + signField.setName(pluginSignField.getDescription()); + signField.setField(pluginSignField.getFieldValue()); + signField.setIsFuzzy(pluginSignField.getIsFuzzy()); + signField.setIsRequired(pluginSignField.getIsRequired()); + signField.setType(pluginSignField.getType()); + signFieldList.add(signField); + } + } + signInfoVo.setIsSign(0); + signInfoVo.setSignField(signFieldList); + } + + return signInfoVo; + } + + + + + /*=====================================================================================================*/ /** * 签到 diff --git a/mt/src/main/resources/mapper_raw/MtSigninOtherMapper.xml b/mt/src/main/resources/mapper_raw/MtSigninOtherMapper.xml index a54e2116..5684115b 100644 --- a/mt/src/main/resources/mapper_raw/MtSigninOtherMapper.xml +++ b/mt/src/main/resources/mapper_raw/MtSigninOtherMapper.xml @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - id, user_id, key, value, created_at, updated_at, rec_status + id, signin_basic_id, key, value, created_at, updated_at, rec_status