DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -150,6 +150,9 @@ @Autowired private GeodesyUtil geodesyUtil; @Value("${spring.profiles.active}") private String activeProfile; @Override public List<Driver> queryIdleDriver(Integer type, Double lon, Double lat, Double distance, Integer companyId) throws Exception { @@ -646,7 +649,7 @@ } } //专车业务需要校验 if(0 == driver.getIsSynchronous() && (type.contains("1") || type.contains("3"))){ if("prod".equals(activeProfile) && 0 == driver.getIsSynchronous() && (type.contains("1") || type.contains("3"))){ return ResultUtil.error("请先开通钱包"); } //判断车辆是否正在使用中 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -579,7 +579,7 @@ name = name.replaceAll("& #41;", ")"); tCompany.setName(name); tCompany.setUpdateTime(new Date()); tCompany.setVersion(tCompany.getVersion() + 1); // tCompany.setVersion(tCompany.getVersion() + 1); tCompanyService.updateById(tCompany); //修改账号密码 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -45,10 +45,6 @@ @Override public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) { List<Map<String, Object>> driverList = this.baseMapper.getDriverList(page, roleType, nowUserId, beginTime, endTime, companyName, phone, name, addType, authState); for (Map<String, Object> stringObjectMap : driverList) { // stringObjectMap } return driverList; }
@@ -53,11 +53,13 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.mail.MessagingException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.PrintWriter; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; import java.net.NetworkInterface; @@ -65,6 +67,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** * 订单控制器（综合） @@ -2546,12 +2551,20 @@ // 根据订单类型和ID查询订单 orderList = queryOrdersByTypeAndIds(uid, tripSheet.getOrderType(), tripSheet.getOrderIdList()); } List<TripOrderVo> tripOrderVos = processTripOrderVos(orderList); String filePath = tripSheetGenerator.generatePdf(tripOrderVos); File attachment = new File(filePath); String displayFileName = "贵人家园出行-行程单.pdf"; emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "贵人家园出行-行程单", "请查收您的行程单", attachment, displayFileName); attachment.delete(); // 发送成功后删除临时文件 ThreadPoolExecutor poolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>()); List<TripOrderVo> finalOrderList = orderList; poolExecutor.execute(()->{ try { List<TripOrderVo> tripOrderVos = processTripOrderVos(finalOrderList); String filePath = tripSheetGenerator.generatePdf(tripOrderVos); File attachment = new File(filePath); String displayFileName = "贵人家园出行-行程单.pdf"; emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "贵人家园出行-行程单", "请查收您的行程单", attachment, displayFileName); attachment.delete(); } catch (Exception e) { e.printStackTrace(); } }); Map<String, Object> result = new HashMap<>(); result.put("orderNum", orderList.size()); return ResultUtil.success(result); UserQYTTravel/guns-admin/src/main/resources/logback.xml
@@ -7,8 +7,8 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <!-- <property name="log.path" value="/etraffic/server/chuxing/logs/user"/>--> <property name="log.path" value="/Users/mitao/Documents/etraffic/server/chuxing/logs/user"/> <property name="log.path" value="/etraffic/server/chuxing/logs/user"/> <!-- <property name="log.path" value="/Users/mitao/Documents/etraffic/server/chuxing/logs/user"/>--> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 --> ZuulQYTTravel/src/main/resources/application-dev.yml
@@ -32,10 +32,10 @@ serviceid: dispatch-server #指定Eureka注册中心的服务id # 配置zuul超时时间 host: connect-timeout-millis: 150000 socket-timeout-millis: 15000 connect-timeout-millis: 30000 socket-timeout-millis: 30000 # 配置ribbon超时时间 ribbon: ReadTimeout: 10000 ConnectTimeout: 10000 ReadTimeout: 30000 ConnectTimeout: 30000 ZuulQYTTravel/src/main/resources/application-prod.yml
@@ -34,10 +34,10 @@ serviceid: dispatch-server #指定Eureka注册中心的服务id # 配置zuul超时时间 host: connect-timeout-millis: 150000 socket-timeout-millis: 15000 connect-timeout-millis: 30000 socket-timeout-millis: 3000 # 配置ribbon超时时间 ribbon: ReadTimeout: 10000 ConnectTimeout: 10000 ReadTimeout: 30000 ConnectTimeout: 30000 ZuulQYTTravel/src/main/resources/application-test.yml
@@ -34,10 +34,10 @@ serviceid: dispatch-server #指定Eureka注册中心的服务id # 配置zuul超时时间 host: connect-timeout-millis: 150000 socket-timeout-millis: 15000 connect-timeout-millis: 30000 socket-timeout-millis: 3000 # 配置ribbon超时时间 ribbon: ReadTimeout: 10000 ConnectTimeout: 10000 ReadTimeout: 30000 ConnectTimeout: 30000
