flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -9,6 +9,7 @@ import com.dg.core.db.gen.entity.GuideEvolveEntity; import com.dg.core.db.gen.entity.GuideRepairOrder; import com.dg.core.db.gen.entity.SysUser; import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil; import com.dg.core.service.IGuideEvolveService; import com.dg.core.service.IGuideRepairOrderService; import com.dg.core.service.IOrganizationChartService; @@ -20,6 +21,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -44,6 +46,9 @@ @Resource IOrganizationChartService iOrganizationChartService; @Resource(name = "stringRedisTemplate") private StringRedisTemplate stringRedisTemplate; private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk"; @@ -184,7 +189,7 @@ WxUtil wxUtil=new WxUtil(); String accessToken="0"; try { accessToken= wxUtil.getBatteryCarAccessToken(); accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString(); } catch (Exception e) { throw new RuntimeException(e); } flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -7,6 +7,7 @@ import com.dg.core.annotation.Authorization; import com.dg.core.annotation.CurrentUser; import com.dg.core.db.gen.entity.*; import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil; import com.dg.core.service.IGuideEvolveService; import com.dg.core.service.IGuideRepairOrderService; import com.dg.core.service.IOrganizationChartService; @@ -18,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -42,6 +44,9 @@ @Autowired IOrganizationChartService iOrganizationChartService; @Resource(name = "stringRedisTemplate") private StringRedisTemplate stringRedisTemplate; private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk"; @@ -231,7 +236,7 @@ WxUtil wxUtil=new WxUtil(); String accessToken="0"; try { accessToken= wxUtil.getBatteryCarAccessToken(); accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString(); } catch (Exception e) { throw new RuntimeException(e); } flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -7,6 +7,7 @@ import com.dg.core.ResultData; import com.dg.core.db.gen.entity.*; import com.dg.core.db.gen.mapper.*; import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil; import com.dg.core.service.IGuideRepairOrderService; import com.dg.core.service.ISysSettingsService; import com.dg.core.util.SmsUtil; @@ -14,8 +15,10 @@ import com.dg.core.util.TestDate; import com.dg.core.util.WxUtil; import com.iceyyy.workday.WorkUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.time.LocalDate; import java.time.LocalDateTime; @@ -46,8 +49,15 @@ @Resource private AutomessageSysSettingsMapper iSysSettingsMapper; @Resource SmsUtil smsUtil; @Resource(name = "stringRedisTemplate") private StringRedisTemplate stringRedisTemplate; private static WxUtil wxUtil; @Override public int addOrder(GuideRepairOrder guideRepairOrder) { @@ -75,12 +85,12 @@ } if (isAdd) { //自动分配业务代码开始 List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(),guideRepairOrder.getAreaCode()); List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(), guideRepairOrder.getAreaCode()); if (organizationChartEntities.size() > 0) { for (OrganizationChartEntity organizationChart : organizationChartEntities) { departmentIds.add(organizationChart.getId().toString()); } List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员 List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员 if (sysUsers.size() == 0) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员 for (OrganizationChartEntity organizationChart : organizationChartEntities) { //获取下级部门 @@ -89,12 +99,25 @@ if (organizationChartEntitiesUser != null) departmentIds = this.getDepartmentIds(organizationChartEntitiesUser, departmentIds); } sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员 if (sysUsers.size() == 0) {//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员 sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员 if (sysUsers.size() == 0)//如果该所属地区没有导办人员则为特殊单据需要手动分配 guideRepairOrder.setState("1"); sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员 if (sysUsers.size() == 0) {//如果该所属地区没有导办人员则为获取其上級地区有没有相关分类导办人员 List<String> departmentIdsParent = new ArrayList<>(); departmentIdsParent.addAll(departmentIds); for (String departmentId : departmentIdsParent) { OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId)); OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId())); departmentIds.add(organizationChartParent.getId().toString()); } sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员 if (sysUsers.size() == 0) { sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员 if (sysUsers.size() == 0) { //如果该所属地区没有导办人员则为特殊单据需要手动分配 guideRepairOrder.setState("1"); } } } } if (sysUsers.size() > 0) {//系统分配导办人员 SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一 @@ -202,20 +225,20 @@ @Override public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName, List<String> ids,String status, String matterName, List<String> ids, String status, String guideUserId) { return baseMapper.selectConfigList(page, state, matterName, ids,status,guideUserId); return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId); } @Override public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status, public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status, String guideUserId) { return baseMapper.selectConfigList(matterName, ids,status,guideUserId); return baseMapper.selectConfigList(matterName, ids, status, guideUserId); } @Override public int countConfigList(String matterName, List<String> ids,String status,String guideUserId) { return baseMapper.countConfigList(matterName, ids,status,guideUserId); public int countConfigList(String matterName, List<String> ids, String status, String guideUserId) { return baseMapper.countConfigList(matterName, ids, status, guideUserId); } @Override @@ -241,7 +264,7 @@ SysUser sysUserTo = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId())); SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId())); sysUserTo.setTransactionNum(sysUserTo.getTransactionNum() + 1); if (sysUserFrom.getUserType().equals(2)){ if (sysUserFrom.getUserType().equals(2)) { sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1); sysUserMapper.updateById(sysUserFrom); } @@ -258,7 +281,7 @@ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1); return sysUserMapper.updateById(sysUserFrom); } } } return 0; } @@ -272,9 +295,9 @@ @Override public int countStatisticsNum(String state, List<String> ids, String time, String isTimeout, String evaluateState, List<String> classifyIds,String serviceState, List<String> classifyIds, String serviceState, String guideUserId) { return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState,guideUserId); return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds, serviceState, guideUserId); } @Override @@ -317,7 +340,7 @@ DateTime dateTime = td.nextWeekDay(dateTimeUser); Calendar calendar = dateTime.toCalendar(); LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DATE), 9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间 guideRepairOrder.setTimeoutTime(localDateTime); } @@ -326,7 +349,7 @@ DateTime dateTime = td.nextWeekDay(dateTimeUser); Calendar calendar = dateTime.toCalendar(); LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DATE), 9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间 guideRepairOrder.setTimeoutTime(localDateTime); } @@ -338,7 +361,7 @@ WxUtil wxUtil = new WxUtil(); String accessToken = "0"; try { accessToken = wxUtil.getBatteryCarAccessToken(); accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString(); } catch (Exception e) { throw new RuntimeException(e); } @@ -352,13 +375,13 @@ //删除进展记录 guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id)); TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId())); transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()-1); transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1); //对应办事指南减一 transactionEventMapper.updateById(transactionEvent); SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId())); if (sysUser!=null){ if (sysUser != null) { //对应导半人员待导半数量建议 sysUser.setTransactionNum(sysUser.getTransactionNum()-1); sysUser.setTransactionNum(sysUser.getTransactionNum() - 1); sysUserMapper.updateById(sysUser); } return baseMapper.deleteConfigById(Id); @@ -370,16 +393,15 @@ WxUtil wxUtil = new WxUtil(); String accessToken = "0"; try { accessToken = wxUtil.getBatteryCarAccessToken(); accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString(); } catch (Exception e) { throw new RuntimeException(e); } for (GuideRepairOrder guideRepairOrder:guideRepairOrders) { for (GuideRepairOrder guideRepairOrder : guideRepairOrders) { SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId())); if (sysUser!=null) { if (sysUser != null) { smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName()); wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(),accessToken,"86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8",sysUser); wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser); guideRepairOrder.setIsPush(1); guideRepairOrder.setIsTimeout("2"); baseMapper.updateById(guideRepairOrder); @@ -392,7 +414,7 @@ public int updateEvaluate() { //查找一天没有评价的单据 List<GuideRepairOrder> guideRepairOrders = baseMapper.selectEvaluate(); for (GuideRepairOrder guideRepairOrder:guideRepairOrders) { for (GuideRepairOrder guideRepairOrder : guideRepairOrders) { guideRepairOrder.setEvaluateState("1"); guideRepairOrder.setEvaluateContent("好评"); guideRepairOrder.setServiceState(1); @@ -403,7 +425,7 @@ entity.setCreateTime(LocalDateTime.now()); entity.setUpdateTime(LocalDateTime.now()); entity.setState("12"); entity.setFromUserId(guideRepairOrder.getSubmitUserId()+""); entity.setFromUserId(guideRepairOrder.getSubmitUserId() + ""); entity.setGuideId(guideRepairOrder.getId().toString()); guideEvolveMapper.insertConfig(entity);
@@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.dg.core.annotation.Authorization; import com.dg.core.db.gen.entity.GuideEvolveEntity; import com.dg.core.db.gen.entity.GuideRepairOrder; import com.dg.core.db.gen.entity.SysUser; @@ -14,8 +15,13 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -29,6 +35,17 @@ private static String miniprogramState="trial";//trial 为测试版 formal 为正式版 切记发布版本时候改为正式版 @Resource(name = "stringRedisTemplate") private StringRedisTemplate stringRedisTemplate; private static WxUtil wxUtil; @PostConstruct public void init() { wxUtil = this; wxUtil.stringRedisTemplate = this.stringRedisTemplate; } /** * 获取花城token，（ps:0=token获取失败） * @@ -36,19 +53,20 @@ */ public String getBatteryCarAccessToken() throws Exception { String accessToken = "0"; try { // 此处APP_ID APP_SECRET 在微信小程序后端可见 // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET); String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + ConstantPropertiesUtil.WX_OPEN_APP_ID + "&secret=" +ConstantPropertiesUtil.WX_OPEN_APP_SECRET; String result = httpGet(accessTokenUrl, null, null); Map<String, Object> resultMap = JSON.parseObject(result, Map.class); if (resultMap.containsKey("access_token")) { accessToken = resultMap.get("access_token").toString(); } } catch (IOException ioe) { ioe.printStackTrace(); } // try { // // 此处APP_ID APP_SECRET 在微信小程序后端可见 // // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET); // String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + ConstantPropertiesUtil.WX_OPEN_APP_ID // + "&secret=" +ConstantPropertiesUtil.WX_OPEN_APP_SECRET; // String result = httpGet(accessTokenUrl, null, null); // Map<String, Object> resultMap = JSON.parseObject(result, Map.class); // if (resultMap.containsKey("access_token")) { // accessToken = resultMap.get("access_token").toString(); // } // } catch (IOException ioe) { // ioe.printStackTrace(); // } accessToken =wxUtil.stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString(); return accessToken; }
@@ -13,6 +13,7 @@ #Redis spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.database=2 spring.redis.password=nahanRedisPwsIsVerySimple&&
@@ -102,9 +102,9 @@ <select id="selectByKeyWord" resultMap="OrganizationChartResult"> <include refid="selectOrganizationChartVo"/> where organization_name like concat('%', #{keyWord}, '%') where grade=1 and ( organization_name like concat('%', #{keyWord}, '%') or((detailed_address like concat('%', #{keyWord}, '%') ) and TRIM(detailed_address) !='') or((resume like concat('%', #{keyWord}, '%') ) and TRIM(resume) != '' ) or((resume like concat('%', #{keyWord}, '%') ) and TRIM(resume) != '' )) </select> <select id="selectByCode" resultMap="OrganizationChartResult"> flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -202,7 +202,7 @@ </foreach> </if> <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''"> and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%')) and (matters_ids like concat('%',#{classifyIdFront}, '%') or matters_ids like concat('%',#{classifyIdAfter}, '%')) </if> </where> flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -431,7 +431,7 @@ <select id="selectSearch" resultType="com.dg.core.db.manual.pojo.Search"> select id,title,content,views, type FROM( select id,organization_name title,resume content,null views,1 type from automessage_organization_chart UNION select id,organization_name title,resume content,null views,1 type from automessage_organization_chart where grade=1 UNION select id,matter_name title,concat((select classify_name from automessage_classify_administration where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)), '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content, springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -11,6 +11,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import cn.hutool.core.util.StrUtil; import com.jcraft.jsch.SftpException; import com.panzhihua.applets.config.MinioUtil; import com.panzhihua.applets.umf.UmfPayUtil; @@ -183,7 +184,9 @@ File file1=new File(uuid+"_compress.jpg"); String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg"); //上传完压缩图后把原图清理，防止文件服务器资源爆满 minioUtil.removeMinio(fileName); if (StrUtil.isNotBlank(fileName)){ minioUtil.removeMinio(fileName); } return R.ok(imageUrl); } catch (Exception e) { log.error("上传照片失败【{}】", e.getMessage()); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
@@ -1,15 +1,14 @@ package com.panzhihua.applets.api; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import com.panzhihua.common.api.LcApiConstants; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.panzhihua.applets.config.WxMaConfiguration; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.utlis.HttpClientUtil; import com.panzhihua.common.utlis.StringUtils; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.web.bind.annotation.GetMapping; @@ -17,15 +16,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.utlis.HttpClientUtil; import com.panzhihua.common.utlis.StringUtils; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.TimeUnit; @Slf4j @RestController @@ -34,7 +31,6 @@ @Resource private StringRedisTemplate stringRedisTemplate; // 公众号appid private List<String> appidList = new ArrayList<String>() { { @@ -67,8 +63,7 @@ /** * 根据文章链接抓取文章内容 * * @param url * 文章链接 * @param url 文章链接 * @return 文章内容 */ public static String getActicle(String url) { @@ -85,15 +80,14 @@ /** * 获取token * * @param appid * 公众号appid * @param secret * 公众号secret * @param appid 公众号appid * @param secret 公众号secret * @return token */ private String getToken(String appid, String secret) throws IOException { // access_token接口https请求方式: GET // https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET String path = " https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential"; URL url = new URL(path + "&appid=" + appid + "&secret=" + secret); HttpURLConnection connection = (HttpURLConnection)url.openConnection(); @@ -108,22 +102,23 @@ sb.append(new String(b, 0, len)); } // System.out.println(sb.toString()); in.close(); return sb.toString(); } /** * 通过token获取公众号文章 * * @param token * token * @param token token * @return 获取的文章列表结果 */ private String getContentList(String token) throws IOException { String path = " https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token; URL url = new URL(path); HttpURLConnection connection = (HttpURLConnection)url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestMethod("POST"); connection.setDoOutput(true); connection.setRequestProperty("content-type", "application/json;charset=utf-8"); @@ -163,22 +158,24 @@ if (!appidList.isEmpty()) { for (int i = 0; i < appidList.size(); i++) { String token = officialApi.getToken(appidList.get(i), secretList.get(i)); log.info("通过appid:" + appidList.get(i) + "获取token返回参数：" + token); JSONObject tokenJson = JSON.parseObject(token); if (StringUtils.isNotEmpty(tokenJson)) { tokenList.add(tokenJson.getString("access_token")); if (StringUtils.isNotEmpty(token)) { tokenList.add(token); } } } } List<JSONObject> resultList = new ArrayList<>(); Boolean newsListKey = stringRedisTemplate.hasKey(UserConstants.NEWS_LIST); if(newsListKey != null && newsListKey){ if (newsListKey != null && newsListKey) { String json = valueOperations.get(UserConstants.NEWS_LIST); resultList = JSON.parseArray(json,JSONObject.class); resultList = JSON.parseArray(json, JSONObject.class); return R.ok(resultList); } if (!tokenList.isEmpty()) { for (String token:tokenList) { for (String token : tokenList) { try { String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token; String result = getActicle(url); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
@@ -94,7 +94,7 @@ // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename()); String fileName = s.append(name).toString(); String contentType = file.getContentType(); minioClient.putObject(minioProperties.getBucket(), fileName, input, contentType); minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream"); StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl()); String url = fileUrl.append(fileName).toString(); return fileName; springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java
@@ -51,7 +51,7 @@ } public static void main(String[] args) throws Exception{ String ryo7M3n8loC5Abcd = MyAESUtil.Encrypt("{\"order_status\":\"3\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13980596944\"}", "Ryo7M3n8loC5Abcd"); String ryo7M3n8loC5Abcd = MyAESUtil.Encrypt("{\"order_status\":\"6\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13699017236\"}", "Ryo7M3n8loC5Abcd"); // String ryo7M3n8loC5Abcd = MyAESUtil.Decrypt("Ixp8WMuJ9bnKhiBKmKWq\\/rQXQ7SaWc3fHLB1e\\/PzAvIEN0CH1nXtMCBzMegT49on31S+3Itop388Yc0EGVx30GGVlG81p7ssiqHlLRna2i903Rid9hqbjZdrBomiy2jp", "Ryo7M3n8loC5Abcd"); // String ryo7M3n8loC5Abcd = MyAESUtil.Decrypt("0H4upa36EW9AFSNcoF9rVX6D5enB9T/9P1hWxLf/NgiGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL7brj8aWdMmnWJp/W1i5lpM=", "Ryo7M3n8loC5Abcd"); // 订单完成13980596944 {"aesString":"0H4upa36EW9AFSNcoF9rVX6D5enB9T\/9P1hWxLf\/NgiGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL2IYlgC9A6hhT82p\/kQTjTk="} springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
@@ -525,7 +525,7 @@ subscribeDTO.setTemplate_id(templateId); subscribeDTO.setPage("packageD/pages/washer/order/index"); List<TemplateParam> paras=new ArrayList<TemplateParam>(); paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "":washerName)); paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName)); paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0":washerMobile)); subscribeDTO.setTemplateParamList(paras); try { @@ -576,8 +576,8 @@ subscribeDTO.setPage("packageD/pages/washer/order/index"); List<TemplateParam> paras=new ArrayList<TemplateParam>(); paras.add(new TemplateParam("thing4", status)); paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "":washerName)); paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "":washerMobile)); paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName)); paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile)); subscribeDTO.setTemplateParamList(paras); try { sendSubscribe(accessToken,subscribeDTO); @@ -602,8 +602,8 @@ subscribeDTO.setPage("pages/washer/order/index"); List<TemplateParam> paras=new ArrayList<TemplateParam>(); paras.add(new TemplateParam("thing4", status)); paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "":washerName)); paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "":washerMobile)); paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName)); paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile)); subscribeDTO.setTemplateParamList(paras); try { sendSubscribe(accessToken,subscribeDTO); @@ -628,8 +628,8 @@ subscribeDTO.setPage("packageD/pages/washer/order/index"); List<TemplateParam> paras=new ArrayList<TemplateParam>(); paras.add(new TemplateParam("phrase14", status)); paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "":washerName)); paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "":washerMobile)); paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName)); paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile)); subscribeDTO.setTemplateParamList(paras); try { sendSubscribe(accessToken,subscribeDTO); @@ -654,8 +654,8 @@ subscribeDTO.setPage("pages/washer/order/index"); List<TemplateParam> paras=new ArrayList<TemplateParam>(); paras.add(new TemplateParam("phrase14", status)); paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "":washerName)); paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "":washerMobile)); paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName)); paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile)); subscribeDTO.setTemplateParamList(paras); try { sendSubscribe(accessToken,subscribeDTO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
@@ -117,8 +117,6 @@ public void sendMessage(ComActDynVO comActDynVO) { try { List<String> openIds = sysUserDao.selectOpenId(); String appId = "wx118de8a734d269f0"; WxXCXTempSend wxXCXTempSend = new WxXCXTempSend(); WxMaService maService = wxMaConfiguration.getMaService("wx118de8a734d269f0"); for (int i = 0; i < openIds.size(); i++) { try { springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysOperLogDO.java
@@ -15,7 +15,7 @@ * @create: 2020-12-25 10:34 **/ @Data @TableName("sys_oper_log_1") @TableName("sys_oper_log") public class SysOperLogDO implements Serializable { private static final long serialVersionUID = 1L; springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1001,7 +1001,7 @@ userDao.updateComPbMemberUserId(idCard, sysUserDO.getUserId()); } SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId()); /*SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId()); if (user != null) { // 实名认证成功推送订阅消息给用户 try { @@ -1014,7 +1014,7 @@ } catch (Exception e) { log.error("推送用户订阅消息失败，失败原因：" + e.getMessage()); } } }*/ return R.ok(); } return R.fail(); @@ -1584,11 +1584,11 @@ || operlog.getTitle().equals(UPDATEACIDRECORD)); if (flag) { //保存数据 // try { //// operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog)); // } catch (JsonProcessingException e) { // e.printStackTrace(); // } try { operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog)); } catch (JsonProcessingException e) { e.printStackTrace(); } } SysOperLogDO sysOperLogDO = new SysOperLogDO(); BeanUtils.copyProperties(operlog, sysOperLogDO);
