huanghai
/
YltProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 12 months ago
parent c9ee9ad939
commit 247d251415
7 changed files with 139 additions and 135 deletions
Show Stats Download Patch File Download Diff File

2
Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml
Unescape View File

@ -309,7 +309,7 @@ hystrix:
enabled: true #配置HystrixCommand的执行是否启用超时时间 enabled: true #配置HystrixCommand的执行是否启用超时时间
isolation: isolation:
thread: thread:
timeoutInMilliseconds: 8000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 8s timeoutInMilliseconds: 80000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 80s
# 数据库 # 数据库
spring: spring:

2
Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml
Unescape View File

@ -309,7 +309,7 @@ hystrix:
enabled: true #配置HystrixCommand的执行是否启用超时时间 enabled: true #配置HystrixCommand的执行是否启用超时时间
isolation: isolation:
thread: thread:
timeoutInMilliseconds: 8000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 8s timeoutInMilliseconds: 80000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 80s
# 数据库 # 数据库
spring: spring:

31
Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java
Unescape View File

@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Map; import java.util.Map;
@ -24,6 +25,7 @@ public class ChargeOrderTotalMannageController {
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -34,18 +36,17 @@ public class ChargeOrderTotalMannageController {
@ResponseBody @ResponseBody
public CommonResponse orderManagementPageInfo(HttpServletRequest request) { public CommonResponse orderManagementPageInfo(HttpServletRequest request) {
try { try {
Map orderManagementPageInfo = chargeOrderMannageService.orderInfoTotalByTime(); Map orderManagementPageInfo = chargeOrderMannageService.orderInfoTotalByTime();
return I100cResponse.success(orderManagementPageInfo); return I100cResponse.success(orderManagementPageInfo);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -59,7 +60,7 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.bigData(); Map bigData = chargeOrderMannageService.bigData();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
@ -67,6 +68,7 @@ public class ChargeOrderTotalMannageController {
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -82,13 +84,14 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.queryChargeInfoByRegionalName(); Map bigData = chargeOrderMannageService.queryChargeInfoByRegionalName();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -104,13 +107,14 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.queryEquipmentType(); Map bigData = chargeOrderMannageService.queryEquipmentType();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -126,7 +130,7 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.queryExceptionOrder(); Map bigData = chargeOrderMannageService.queryExceptionOrder();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
@ -134,6 +138,7 @@ public class ChargeOrderTotalMannageController {
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -149,13 +154,14 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.queryConnectorStatue(); Map bigData = chargeOrderMannageService.queryConnectorStatue();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -171,12 +177,14 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.queryChargeDegreeRank(); Map bigData = chargeOrderMannageService.queryChargeDegreeRank();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
/** /**
* 订单统计 * 订单统计
*
* @param request * @param request
* @param * @param
* @param * @param
@ -192,7 +200,7 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.queryChargeDegreeRankCompany(); Map bigData = chargeOrderMannageService.queryChargeDegreeRankCompany();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }
@ -207,6 +215,7 @@ public class ChargeOrderTotalMannageController {
/** /**
* 数据大屏地图站点信息 * 数据大屏地图站点信息
*
* @param request * @param request
* @param * @param
* @param * @param
@ -222,7 +231,7 @@ public class ChargeOrderTotalMannageController {
Map bigData = chargeOrderMannageService.chargeDegreeByStation(); Map bigData = chargeOrderMannageService.chargeDegreeByStation();
return I100cResponse.success(bigData); return I100cResponse.success(bigData);
} catch (Exception e) { } catch (Exception e) {
logger.error("异常信息：",e); logger.error("异常信息：", e);
return I100cResponse.exception(e.getMessage()); return I100cResponse.exception(e.getMessage());
} }
} }

10
Ylt/ms-admin/src/main/java/com/charge/orderbk/listener/LabelFileListener.java
Unescape View File

@ -5,7 +5,6 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSON;
import com.charge.orderbk.client.ExcelServiceApi; import com.charge.orderbk.client.ExcelServiceApi;
import com.charge.orderbk.config.RedisHandle; import com.charge.orderbk.config.RedisHandle;
import com.charge.orderbk.config.TokenServiceTask; import com.charge.orderbk.config.TokenServiceTask;
@ -13,20 +12,15 @@ import com.charge.orderbk.dao.LabelDOMapper;
import com.charge.orderbk.dao.LabelRelationDOMapper; import com.charge.orderbk.dao.LabelRelationDOMapper;
import com.charge.orderbk.dao.UserDOMapper; import com.charge.orderbk.dao.UserDOMapper;
import com.charge.orderbk.model.*; import com.charge.orderbk.model.*;
import com.charge.orderbk.model.ao.SendCouponAO;
import com.charge.orderbk.model.dto.*; import com.charge.orderbk.model.dto.*;
import com.charge.orderbk.service.ActivityNewService;
import com.charge.util.Const; import com.charge.util.Const;
import com.charge.util.MyException; import com.charge.util.MyException;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
/** /**
* 普通活动-人工发放-文件发放 easyExcel导入监听器 * 普通活动-人工发放-文件发放 easyExcel导入监听器
@ -265,9 +259,5 @@ public class LabelFileListener extends AnalysisEventListener<LabelFileDTO> {
int userCount = labelRelationDOMapper.getUserCount(labelDTO.getId()); int userCount = labelRelationDOMapper.getUserCount(labelDTO.getId());
labelDO.setUserCount(userCount); labelDO.setUserCount(userCount);
labelDOMapper.updateByPrimaryKeySelective(labelDO); labelDOMapper.updateByPrimaryKeySelective(labelDO);
return ;
} }
} }

110
Ylt/ms-admin/src/main/resources/bootstrap-dev.yml
Unescape View File

@ -32,61 +32,61 @@ spring:
min-idle: 0 min-idle: 0
# 目前理解没有用，不应该写在这里 # 目前理解没有用，不应该写在这里
orderbkapi: #orderbkapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:32202 # listOfServers: http://ms-admin:7011
#
distributeapi: #distributeapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:31636 # listOfServers: http://ms-admin:7011
#
excelapi: #excelapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30326 # listOfServers: http://i100c.3322.org:30326
#
financeapi: #financeapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:32134 # listOfServers: http://i100c.3322.org:32134
#
noticeapi: #noticeapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30745 # listOfServers: http://i100c.3322.org:30745
#
openapi: #openapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:31301 # listOfServers: http://i100c.3322.org:31301
#
orderapi: #orderapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30258 # listOfServers: http://i100c.3322.org:30258
#
protocolshenghongapi: #protocolshenghongapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:31766 # listOfServers: http://i100c.3322.org:31766
#
stationapi: #stationapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30836 # listOfServers: http://i100c.3322.org:30836
#
taskapi: #taskapi:
ribbon: # ribbon:
listOfServers: http://localhost:7021 # listOfServers: http://localhost:7021
#
userapi: #userapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:32150 # listOfServers: http://i100c.3322.org:32150
#
walletapi: #walletapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30723 # listOfServers: http://i100c.3322.org:30723
#
websocketocppapi: #websocketocppapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30725 # listOfServers: http://i100c.3322.org:30725
#
mgrapi: #mgrapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30115 # listOfServers: http://i100c.3322.org:30115
logging: logging:
level: level:

110
Ylt/ms-admin/target/classes/bootstrap-dev.yml
Unescape View File

@ -32,61 +32,61 @@ spring:
min-idle: 0 min-idle: 0
# 目前理解没有用，不应该写在这里 # 目前理解没有用，不应该写在这里
orderbkapi: #orderbkapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:32202 # listOfServers: http://ms-admin:7011
#
distributeapi: #distributeapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:31636 # listOfServers: http://ms-admin:7011
#
excelapi: #excelapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30326 # listOfServers: http://i100c.3322.org:30326
#
financeapi: #financeapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:32134 # listOfServers: http://i100c.3322.org:32134
#
noticeapi: #noticeapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30745 # listOfServers: http://i100c.3322.org:30745
#
openapi: #openapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:31301 # listOfServers: http://i100c.3322.org:31301
#
orderapi: #orderapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30258 # listOfServers: http://i100c.3322.org:30258
#
protocolshenghongapi: #protocolshenghongapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:31766 # listOfServers: http://i100c.3322.org:31766
#
stationapi: #stationapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30836 # listOfServers: http://i100c.3322.org:30836
#
taskapi: #taskapi:
ribbon: # ribbon:
listOfServers: http://localhost:7021 # listOfServers: http://localhost:7021
#
userapi: #userapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:32150 # listOfServers: http://i100c.3322.org:32150
#
walletapi: #walletapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30723 # listOfServers: http://i100c.3322.org:30723
#
websocketocppapi: #websocketocppapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30725 # listOfServers: http://i100c.3322.org:30725
#
mgrapi: #mgrapi:
ribbon: # ribbon:
listOfServers: http://i100c.3322.org:30115 # listOfServers: http://i100c.3322.org:30115
logging: logging:
level: level:

5
操作文档/7、Mysql数据库下载与还原.md
Unescape View File

@ -160,3 +160,8 @@ ALTER TABLE `mysql`.`event` ENGINE = MyISAM;
ALTER TABLE `mysql`.`func` ENGINE = MyISAM; ALTER TABLE `mysql`.`func` ENGINE = MyISAM;
``` ```
#### MySQL错误-this is incompatible with sql_mode=only_full_group_by完美解决方案
https://blog.csdn.net/weixin_43102784/article/details/136162801

Write Preview
Loading…
Cancel
Save