.gitignore
@@ -4,17 +4,17 @@ .mtj.tmp/ # Package Files # *.jar # *.jar *.war *.ear # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* generator #generator .idea target *.yaml *.yml #*.yaml #*.yml *.log ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -840,7 +840,7 @@ public Object delete(@RequestParam Integer tDriverId) { TDriver driver = tDriverService.selectById(tDriverId); driver.setFlag("3"); ShiroUser user = ShiroKit.getUser(); ShiroUser user = ShiroExtUtil.getUser(); User user1 = userService.selectById(user.getId()); TCompany tCompany = itCompanyService.selectById(user.getObjectId()); //中台先删除司机 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -1,6 +1,5 @@ package com.stylefeng.guns.modular.system.controller.system; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.code.kaptcha.Constants; @@ -19,7 +18,6 @@ import com.stylefeng.guns.modular.system.dao.UserMapper; import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.service.IMenuService; import com.stylefeng.guns.modular.system.service.ITEnterpriseWithdrawalService; import com.stylefeng.guns.modular.system.service.IUserService; import com.stylefeng.guns.modular.system.util.HttpRequestUtil; import com.stylefeng.guns.modular.system.util.PushURL; @@ -79,9 +77,6 @@ private Map<String, Integer> loginFailures = new HashMap<>(); @Resource private ITEnterpriseWithdrawalService enterpriseWithdrawalService; /** * 跳转到主页 @@ -98,7 +93,7 @@ //获取菜单列表 User user = userMapper.getByAccount(loginUser.getImUser()); if (null == user) { logOut(); logOut(request); return null; } ShiroUser shiroUser = shiro.shiroUser(user); @@ -128,9 +123,9 @@ * 退出登录 */ @RequestMapping(value = "/logout", method = RequestMethod.GET) public String logOut() { // redisTemplate.delete(""); HttpUtil.get("https://testsso1.teamshub.com/logout?logouturl=https%3A%2F%2Fsso.teamshub.com%2Flogout%3F%0Alogoutat%3Dhttp%253A%252F%252F127.0.0.1%253A8010%252F"); public String logOut(HttpServletRequest request) { request.getSession().invalidate(); // HttpUtil.get("https://testsso1.teamshub.com/logout?logouturl=https%3A%2F%2Fsso.teamshub.com%2Flogout%3Flogoutat%3Dhttps%3A%2F%2Ftraffic.qytzt.cn%2F"); return REDIRECT + "/"; }
@@ -278,8 +278,8 @@ empId = saveStaffNode.getEmpId(); } else { EditStaffNodeRequest request1 = new EditStaffNodeRequest(); request1.setEmpId(staffNode.getEnterId()); request1.setMobile(user2.getPhone()); request1.setEmpId(staffNode.getEmpId()); request1.setMobile(user2.getPhone()); request1.setEntercode(tCompany.getEnterCode()); request1.setEnterId(Long.valueOf(tCompany.getEnterCode())); request1.setEmpName(user.getName()); @@ -287,13 +287,13 @@ request1.setLoginNo(user.getAccount()); request1.setEmpSex(user.getSex() == 1 ? "男" : "女"); request1.setMphone(user.getPhone()); request1.setEmail(user.getPhone() + "@qyt.com"); request1.setDeptId(0); request1.setPositionId(1); request1.setEmail(user.getPhone() + "@qyt.com"); request1.setDeptIds(staffNode.getDeptId() + ""); request1.setPositionId(1); request1.setSuperLevel(0); request1.setHideMobile(0); EmployeeUtil.editStaffNode(request1); empId = staffNode.getEnterId(); EmployeeUtil.editStaffNode(request1); empId = staffNode.getEmpId(); } oldUser.setEmpId(empId); oldUser.setEntercode(tCompany.getEnterCode()); ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -7,6 +7,7 @@ import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.system.service.ITImgMidService; import com.stylefeng.guns.modular.system.util.ResultUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.NCOSSUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongProperties; import org.slf4j.Logger; @@ -109,11 +110,8 @@ @RequestMapping("/image") @ResponseBody public String image1(@RequestPart("file") MultipartFile picture, HttpServletRequest request) { public ResultUtil image1(@RequestPart("file") MultipartFile file, HttpServletRequest request) { try { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartFile file = (MultipartFile) picture; String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename()); String bucketName = QianYunTongProperties.bucketName; Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName); @@ -121,20 +119,20 @@ //创建桶 Boolean bucket = NCOSSUtil.createBucket(bucketName); if (!bucket) { throw new RuntimeException("创建存储桶失败"); return ResultUtil.error("创建存储桶失败"); } //设置桶策略 String policyText = "{\"Version\":\"2025-06-23\",\"Statement\":[{\"Sid\":\"Stmt20250623\",\"Action\":[\"GetObject\"],\"Effect\":\"Allow\",\"Resource\":\"" + bucketName + "/*\",\"Principal\":\"*\"}]}"; Boolean bucketPolicy = NCOSSUtil.setBucketPolicy(bucketName, policyText); if (!bucketPolicy) { throw new RuntimeException("设置桶策略失败"); return ResultUtil.error("设置桶策略失败"); } } //上传对象 String key = "imgs/management/" + pictureName; String object = NCOSSUtil.putObject(bucketName, key, file.getInputStream()); if (null == object) { throw new RuntimeException("上传图片失败"); return ResultUtil.error("上传图片失败"); } pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key; @@ -144,7 +142,7 @@ // MediaResp mediaResp = MediaExample.uploadImage(picture); // System.out.println("------"+mediaResp); // String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture); return pictureName; return ResultUtil.success(pictureName); } catch (Exception e1) { e1.printStackTrace(); return null; ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java
@@ -51,7 +51,7 @@ /** * 员工所属部门ID多个部门英文; 分割 */ private Integer deptId; private String deptIds; /** * 员工职务ID */ ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java
@@ -11,7 +11,7 @@ /** * 人员ID */ private Integer empId; private Long empId; /** * 主要号码 */ ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -779,25 +779,25 @@ } } var zc1 = $("#zc1").val().trim(); var zc2 = $("#zc2").val().trim(); var zc3 = $("#zc3").val().trim(); var zc4 = $("#zc4").val().trim(); var zc5 = $("#zc5").val().trim(); var zc6 = $("#zc6").val().trim(); var zc7 = $("#zc7").val().trim(); var zc8 = $("#zc8").val().trim(); var zc9 = $("#zc9").val().trim(); var zc1 = null == $("#zc1").val() ? "0" : $("#zc1").val().trim(); var zc2 = null == $("#zc2").val() ? "0" : $("#zc2").val().trim(); var zc3 = null == $("#zc3").val() ? "0" : $("#zc3").val().trim(); var zc4 = null == $("#zc4").val() ? "0" : $("#zc4").val().trim(); var zc5 = null == $("#zc5").val() ? "0" : $("#zc5").val().trim(); var zc6 = null == $("#zc6").val() ? "0" : $("#zc6").val().trim(); var zc7 = null == $("#zc7").val() ? "0" : $("#zc7").val().trim(); var zc8 = null == $("#zc8").val() ? "0" : $("#zc8").val().trim(); var zc9 = null == $("#zc9").val() ? "0" : $("#zc9").val().trim(); var czc1 = $("#czc1").val().trim(); var czc2 = $("#czc2").val().trim(); var czc3 = $("#czc3").val().trim(); var czc4 = $("#czc4").val().trim(); var czc5 = $("#czc5").val().trim(); var czc6 = $("#czc6").val().trim(); var czc7 = $("#czc7").val().trim(); var czc8 = $("#czc8").val().trim(); var czc9 = $("#czc9").val().trim(); var czc1 = null == $("#czc1").val() ? "0" : $("#czc1").val().trim(); var czc2 = null == $("#czc2").val() ? "0" : $("#czc2").val().trim(); var czc3 = null == $("#czc3").val() ? "0" : $("#czc3").val().trim(); var czc4 = null == $("#czc4").val() ? "0" : $("#czc4").val().trim(); var czc5 = null == $("#czc5").val() ? "0" : $("#czc5").val().trim(); var czc6 = null == $("#czc6").val() ? "0" : $("#czc6").val().trim(); var czc7 = null == $("#czc7").val() ? "0" : $("#czc7").val().trim(); var czc8 = null == $("#czc8").val() ? "0" : $("#czc8").val().trim(); var czc9 = null == $("#czc9").val() ? "0" : $("#czc9").val().trim(); if(type == 'pushOrderSettings'){ if("" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9 || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9){ @@ -816,12 +816,12 @@ } } var ptCancel1 = $("#ptCancel1").val().trim(); var ptCancel2 = $("#ptCancel2").val().trim(); var ptCancel3 = $("#ptCancel3").val().trim(); var ptCancel4 = $("#ptCancel4").val().trim(); var ptCancel5 = $("#ptCancel5").val().trim(); var ptCancel6 = $("#ptCancel6").val().trim(); var ptCancel1 = null == $("#ptCancel1").val() ? "0" : $("#ptCancel1").val().trim(); var ptCancel2 = null == $("#ptCancel2").val() ? "0" : $("#ptCancel2").val().trim(); var ptCancel3 = null == $("#ptCancel3").val() ? "0" : $("#ptCancel3").val().trim(); var ptCancel4 = null == $("#ptCancel4").val() ? "0" : $("#ptCancel4").val().trim(); var ptCancel5 = null == $("#ptCancel5").val() ? "0" : $("#ptCancel5").val().trim(); var ptCancel6 = null == $("#ptCancel6").val() ? "0" : $("#ptCancel6").val().trim(); if(type == 'cancelOrderSettings'){ if("" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6){ Feng.info("输入框不能为空!"); @@ -833,10 +833,10 @@ } } var yyCancel1 = $("#yyCancel1").val().trim(); var yyCancel2 = $("#yyCancel2").val().trim(); var yyCancel3 = $("#yyCancel3").val().trim(); var yyCancel4 = $("#yyCancel4").val().trim(); var yyCancel1 = null == $("#yyCancel1").val() ? "0" : $("#yyCancel1").val().trim(); var yyCancel2 = null == $("#yyCancel2").val() ? "0" : $("#yyCancel2").val().trim(); var yyCancel3 = null == $("#yyCancel3").val() ? "0" : $("#yyCancel3").val().trim(); var yyCancel4 = null == $("#yyCancel4").val() ? "0" : $("#yyCancel4").val().trim(); if(type == 'cancelTheReservationOrderSetting'){ if("" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4){ Feng.info("输入框不能为空!"); @@ -847,12 +847,12 @@ return ; } } var pdpd1 = $('#pdpd1').val().trim(); var pdpd2 = $('#pdpd2').val().trim(); var pdpd3 = $('#pdpd3').val().trim(); var pdpd4 = $('#pdpd4').val().trim(); var pdpd5 = $('#pdpd5').val().trim(); var pdpd6 = $('#pdpd6').val().trim(); var pdpd1 = null == $("#pdpd1").val() ? "0" : $('#pdpd1').val().trim(); var pdpd2 = null == $("#pdpd2").val() ? "0" : $('#pdpd2').val().trim(); var pdpd3 = null == $("#pdpd3").val() ? "0" : $('#pdpd3').val().trim(); var pdpd4 = null == $("#pdpd4").val() ? "0" : $('#pdpd4').val().trim(); var pdpd5 = null == $("#pdpd5").val() ? "0" : $('#pdpd5').val().trim(); var pdpd6 = null == $("#pdpd6").val() ? "0" : $('#pdpd6').val().trim(); if(type == 'spellOrderSetting'){ if("" == pdpd1 || "" == pdpd2 || "" == pdpd3 || "" == pdpd4 || "" == pdpd5 || "" == pdpd6){ Feng.info("输入框不能为空!"); @@ -864,10 +864,10 @@ } } var phone1 = $("#phone1").val().trim(); var phone2 = $("#phone2").val().trim(); var phone3 = $("#phone3").val().trim(); var phone5 = $("#phone5").val().trim(); var phone1 = null == $("#phone1").val() ? "0" : $("#phone1").val().trim(); var phone2 = null == $("#phone2").val() ? "0" : $("#phone2").val().trim(); var phone3 = null == $("#phone3").val() ? "0" : $("#phone3").val().trim(); var phone5 = null == $("#phone5").val() ? "0" : $("#phone5").val().trim(); if(type == "phoneSettings"){ if('' == phone1 || '' == phone2 || '' == phone3 || '' == phone5){ Feng.info("输入框不能为空!"); ManagementQYTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js
@@ -84,8 +84,12 @@ // 文件上传成功，给item添加成功class, 用样式标记上传成功。 bindedObj.on('uploadSuccess', function(file,response) { Feng.success("上传成功"); $("#" + me.pictureId).val(response); if (response.code == 200) { Feng.success("上传成功"); $("#" + me.pictureId).val(response.data); } else { Feng.error("上传失败"); } }); // 文件上传失败，显示上传出错。 ManagementQYTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-object.js
@@ -84,8 +84,12 @@ // 文件上传成功，给item添加成功class, 用样式标记上传成功。 bindedObj.on('uploadSuccess', function(file,response) { Feng.success("上传成功"); $("#" + me.pictureId).val(response); if (200 == response.code) { Feng.success("上传成功"); $("#" + me.pictureId).val(response.data); } else { Feng.error("上传失败"); } }); // 文件上传失败，显示上传出错。 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1763,36 +1763,39 @@ public OrderServerWarpper queryOrderServer(Integer orderId, Integer uid) throws Exception { OrderServerWarpper orderServerWarpper = new OrderServerWarpper(); OrderTaxi orderTaxi = this.selectById(orderId); if(null == orderTaxi){ if (null == orderTaxi) { return orderServerWarpper; } //计算预计距离和剩余时间 String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderTaxi.getDriverId())); if(null == value || "".equals(value)){ System.err.println("司机没有上传位置信息"); //调用获取轨迹中的数据 List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2); if(list.size() > 0){ Map<String, Object> map = list.get(list.size() - 1); value = map.get("lon") + "," + map.get("lat"); String value = null; if (null != orderTaxi.getDriverId()) { value = (String) redisTemplate.opsForValue().get("DRIVER" + orderTaxi.getDriverId()); if (null == value || "".equals(value)) { System.err.println("司机没有上传位置信息"); //调用获取轨迹中的数据 List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2); if (list.size() > 0) { Map<String, Object> map = list.get(list.size() - 1); value = map.get("lon") + "," + map.get("lat"); } } } orderServerWarpper.setOrderId(orderTaxi.getId()); orderServerWarpper.setOrderType(2); orderServerWarpper.setState(orderTaxi.getState()); orderServerWarpper.setLon(null != value ? value.split(",")[0] : "0.0"); orderServerWarpper.setLat(null != value ? value.split(",")[1] : "0.0"); orderServerWarpper.setReassignNotice(orderTaxi.getReassignNotice()); if(orderTaxi.getState() == 2 || orderTaxi.getState() == 3){//前往预约地 if (orderTaxi.getState() == 2 || orderTaxi.getState() == 3) {//前往预约地 // TODO: 2023/11/4 无法修改 Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), 1); String d = "0"; String t = "0"; if(null == distance){ if (null == distance) { System.err.println("查询距离出错了"); }else{ } else { d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString(); t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + ""; } @@ -2090,11 +2093,7 @@ } Company query = companyCityService.query(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司 List<PushOrder> querys = pushOrderService.querys(null, 2, query.getId());//获取需要推送的次数 boolean b = false; for (int i = 1; i <= querys.size(); i++) { if (b) { break; } PushOrder pushOrder = pushOrderService.querys(i, 2, query.getId()).get(0); System.out.println("pushOrder:" + pushOrder); //获取空闲司机 UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,9 +1,6 @@ //package com.stylefeng.guns; // //import com.stylefeng.guns.modular.system.service.IIncomeService; //import org.junit.Test; //import org.junit.runner.RunWith; //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.boot.test.context.SpringBootTest; //import org.springframework.test.context.junit4.SpringRunner; // @@ -17,12 +14,5 @@ //@SpringBootTest //public class GunsApplicationTest { // // @Autowired // private IIncomeService incomeService; // // // @Test // public void test1() throws Exception { // incomeService.saveIncome(3857, 1, 30D); // } //}
