DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -720,7 +720,7 @@ if (state != 1) { break; } if (i == querys.size() && state == 1) { if (i == 6 && state == 1) { pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2); orderTaxi1.setState(10); orderTaxiService.updateById(orderTaxi1); @@ -798,7 +798,7 @@ orderIds.remove(orderPrivateCar.getId()); return; } if (i == querys.size() && state == 1) { if (i == 6 && state == 1) { pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1); orderPrivateCar.setState(10); orderPrivateCarService.updateById(orderPrivateCar); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/rongyun/RongYunUtil.java
@@ -18,11 +18,8 @@ @Component public class RongYunUtil { @Value("${rongyun.app_key}") private String app_key; @Value("${rongyun.app_secret}") private String app_secret; public static String app_key = "bmdehs6pbnozs"; public static String app_secret = "RovVwtABN1"; /** UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java
@@ -10,10 +10,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import sun.security.provider.MD5; import javax.servlet.http.HttpServletRequest; import java.util.Base64; import java.util.List; import java.util.Map;
@@ -1,61 +1,61 @@ package com.stylefeng.guns.modular.code.controller; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.config.properties.DruidProperties; import com.stylefeng.guns.generator.action.config.WebGeneratorConfig; import com.stylefeng.guns.generator.action.model.GenQo; import com.stylefeng.guns.modular.code.factory.DefaultTemplateFactory; import com.stylefeng.guns.modular.code.service.TableService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; /** * 代码生成控制器 * * @author fengshuonan * @Date 2017年11月30日16:39:19 */ @Controller @RequestMapping("/code") public class CodeController extends BaseController { private static String PREFIX = "/code"; @Autowired private TableService tableService; @Autowired private DruidProperties druidProperties; /** * 跳转到代码生成主页 */ @RequestMapping("") public String blackboard(Model model) { model.addAttribute("tables", tableService.getAllTables()); model.addAttribute("params", DefaultTemplateFactory.getDefaultParams()); model.addAttribute("templates", DefaultTemplateFactory.getDefaultTemplates()); return PREFIX + "/code.html"; } /** * 生成代码 */ @ApiOperation("生成代码") @RequestMapping(value = "/generate", method = RequestMethod.POST) @ResponseBody public Object generate(GenQo genQo) { genQo.setUrl(druidProperties.getUrl()); genQo.setUserName(druidProperties.getUsername()); genQo.setPassword(druidProperties.getPassword()); WebGeneratorConfig webGeneratorConfig = new WebGeneratorConfig(genQo); webGeneratorConfig.doMpGeneration(); webGeneratorConfig.doGunsGeneration(); return SUCCESS_TIP; } } //package com.stylefeng.guns.modular.code.controller; // //import com.stylefeng.guns.core.base.controller.BaseController; //import com.stylefeng.guns.core.config.properties.DruidProperties; //import com.stylefeng.guns.generator.action.config.WebGeneratorConfig; //import com.stylefeng.guns.generator.action.model.GenQo; //import com.stylefeng.guns.modular.code.factory.DefaultTemplateFactory; //import com.stylefeng.guns.modular.code.service.TableService; //import io.swagger.annotations.ApiOperation; //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.stereotype.Controller; //import org.springframework.ui.Model; //import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMethod; //import org.springframework.web.bind.annotation.ResponseBody; // ///** // * 代码生成控制器 // * // * @author fengshuonan // * @Date 2017年11月30日16:39:19 // */ //@Controller //@RequestMapping("/code") //public class CodeController extends BaseController { // // private static String PREFIX = "/code"; // // @Autowired // private TableService tableService; // // @Autowired // private DruidProperties druidProperties; // // /** // * 跳转到代码生成主页 // */ // @RequestMapping("") // public String blackboard(Model model) { // model.addAttribute("tables", tableService.getAllTables()); // model.addAttribute("params", DefaultTemplateFactory.getDefaultParams()); // model.addAttribute("templates", DefaultTemplateFactory.getDefaultTemplates()); // return PREFIX + "/code.html"; // } // // /** // * 生成代码 // */ // @ApiOperation("生成代码") // @RequestMapping(value = "/generate", method = RequestMethod.POST) // @ResponseBody // public Object generate(GenQo genQo) { // genQo.setUrl(druidProperties.getUrl()); // genQo.setUserName(druidProperties.getUsername()); // genQo.setPassword(druidProperties.getPassword()); // WebGeneratorConfig webGeneratorConfig = new WebGeneratorConfig(genQo); // webGeneratorConfig.doMpGeneration(); // webGeneratorConfig.doGunsGeneration(); // return SUCCESS_TIP; // } //} UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java
@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import javafx.scene.chart.ValueAxis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java
@@ -1,12 +1,7 @@ package com.stylefeng.guns.modular.crossCity.warpper; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import javafx.scene.chart.ValueAxis; import java.util.Date;
@@ -2500,7 +2500,7 @@ } Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司 List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数 for(int i = 1; i <= querys.size(); i++){ for(int i = 1; i <= querys.size()+5; i++){ OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(id); if (null == orderPrivateCar || orderPrivateCar.getState() > 1) { break; @@ -2542,7 +2542,7 @@ orderIds.remove(orderPrivateCar.getId()); return; } if (i == querys.size() && state == 1) { if (i == querys.size()+5 && state == 1) { pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1); orderIds.remove(orderPrivateCar.getId()); } @@ -2584,7 +2584,7 @@ endPushWarpper.setState(1); List<PushOrder> querys = pushOrderService.querys(null, 2, orderPrivateCar.getCompanyId());//获取需要推送的次数 int time = 0; for(int i = 1; i <= querys.size(); i++){ for(int i = 1; i <= querys.size()+5; i++){ PushOrder pushOrder = pushOrderService.querys(i, 2, orderPrivateCar.getCompanyId()).get(0); time += pushOrder.getPushTime() * 1000; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1744,7 +1744,7 @@ endPushWarpper.setState(1); List<PushOrder> querys = pushOrderService.querys(null, 2, orderTaxi.getCompanyId());//获取需要推送的次数 int time = 0; for(int i = 1; i <= querys.size(); i++){ for(int i = 1; i <= querys.size()+5; i++){ PushOrder pushOrder = pushOrderService.querys(i, 2, orderTaxi.getCompanyId()).get(0); time += pushOrder.getPushTime() * 1000; } @@ -2101,7 +2101,7 @@ } Company query = companyCityService.query(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司 List<PushOrder> querys = pushOrderService.querys(null, 2, query.getId());//获取需要推送的次数 for (int i = 1; i <= querys.size(); i++) { for (int i = 1; i <= querys.size()+5; i++) { PushOrder pushOrder = pushOrderService.querys(i, 2, query.getId()).get(0); System.out.println("pushOrder:" + pushOrder); //获取空闲司机 @@ -2132,7 +2132,7 @@ if (state != 1) { break; } if (i == querys.size() && state == 1) { if (i == querys.size()+5 && state == 1) { pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2); orderIds.remove(orderTaxi.getId()); }
