袁野 2 weeks ago
parent c8e364cd2d
commit 3de6144565
  1. 2
      bweb/src/main/java/com/bweb/config/AuthConfig.java
  2. 51
      bweb/src/main/java/com/bweb/controller/SecUserController.java
  3. 43
      bweb/src/main/java/com/bweb/controller/TestController.java
  4. 99
      bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java
  5. 17
      bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java
  6. 116
      bweb/src/main/java/com/bweb/controller/notify/EnNotifyController.java
  7. 559
      bweb/src/main/java/com/bweb/controller/order/EnOrderController.java
  8. 23
      bweb/src/main/resources/dev/logback.xml
  9. 2
      service/src/main/java/com/hfkj/common/QRCodeGenerator.java
  10. 39
      service/src/main/java/com/hfkj/common/utils/HttpsUtils.java
  11. 32
      service/src/main/java/com/hfkj/dao/EnTransportCompanyCarMapper.java
  12. 28
      service/src/main/java/com/hfkj/dao/EnTransportCompanyCarSqlProvider.java
  13. 32
      service/src/main/java/com/hfkj/entity/EnTransportCompanyCar.java
  14. 140
      service/src/main/java/com/hfkj/entity/EnTransportCompanyCarExample.java
  15. 180
      service/src/main/java/com/hfkj/service/aochengcloud/AoChengService.java
  16. 83
      service/src/main/java/com/hfkj/service/item/EnSerOilDepotsSgRelService.java
  17. 127
      service/src/main/java/com/hfkj/service/item/impl/EnSerOilDepotsSgRelServiceImpl.java
  18. 8
      service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyCarServiceImpl.java
  19. 69
      service/src/main/java/com/hfkj/service/order/EnOrderOilService.java
  20. 67
      service/src/main/java/com/hfkj/service/order/EnOrderOpRecordService.java
  21. 71
      service/src/main/java/com/hfkj/service/order/EnOrderService.java
  22. 177
      service/src/main/java/com/hfkj/service/order/impl/EnOrderOilServiceImpl.java
  23. 97
      service/src/main/java/com/hfkj/service/order/impl/EnOrderOpRecordServiceImpl.java
  24. 148
      service/src/main/java/com/hfkj/service/order/impl/EnOrderServiceImpl.java

@ -89,6 +89,8 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/fileUpload/*")
.excludePathPatterns("/common/*")
.excludePathPatterns("/login/*")
.excludePathPatterns("/test/*")
.excludePathPatterns("/enNotify/*")
.excludePathPatterns("/secMenu/queryMenuList")
;
}

@ -12,6 +12,7 @@ import com.hfkj.common.utils.MD5Util;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.SecUser;
import com.hfkj.model.ResponseData;
import com.hfkj.model.UserSessionObject;
import com.hfkj.service.SecUserLoginLogService;
import com.hfkj.service.SecUserService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
@ -66,9 +67,18 @@ public class SecUserController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录账户已存在");
}
} else {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
secUser = new SecUser();
secUser.setPassword(MD5Util.encode("123456".getBytes()));
secUser.setObjectType(SecUserObjectTypeEnum.type1.getCode());
secUser.setObjectType(sessionModel.getAccount().getObjectType());
secUser.setObjectId(sessionModel.getAccount().getObjectId());
secUser.setStatus(SecUserStatusEnum.status1.getCode());
// 校验重复登录账户
@ -270,6 +280,45 @@ public class SecUserController {
}
}
@RequestMapping(value="/sendUserPass",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "修改用户密码")
public ResponseData sendUserPass(@RequestBody String reqBody , HttpServletRequest request) throws Exception{
try {
JSONObject jsonObject = JSONObject.parseObject(reqBody);
SecUserSessionObject session = userCenter.getSessionModel(SecUserSessionObject.class);
Long userId = session.getAccount().getId(); //用户Id
String oldPassword = jsonObject.getString("oldPassword"); //旧密码
String password = jsonObject.getString("newPassword"); //密码
if(userId == null || StringUtils.isBlank(oldPassword) || StringUtils.isBlank(password)) {
log.error("BaseMemberController --> sendUserPass() error!","参数错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
//查询用户
SecUser secUser = secUserService.getDetail(userId);
if(secUser == null){
log.error("BaseMemberController --> sendUserPass() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "用户不存在");
}
if(!secUser.getPassword().equals(MD5Util.encode(oldPassword.getBytes()))) {
log.error("BaseMemberController --> sendUserPass() error!","旧密码不一致");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "旧密码不一致");
}
secUser.setPassword(MD5Util.encode(password.getBytes()));
//修改
secUserService.editUser(secUser);
userCenter.remove(request);
return ResponseMsgUtil.success("修改密码成功");
} catch (Exception e) {
log.error("getUserByTelephone",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -0,0 +1,43 @@
package com.bweb.controller;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.model.ResponseData;
import com.hfkj.service.aochengcloud.AoChengService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.Map;
@Controller
@RequestMapping(value="/test")
@Api(value="测试")
public class TestController {
Logger log = LoggerFactory.getLogger(TestController.class);
@RequestMapping(value="/getDeviceList",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询详情")
public ResponseData getDeviceList() {
try {
Map<String, Object> map = new HashMap<>();
map.put("pageNum" ,1);
return ResponseMsgUtil.success(AoChengService.getDeviceList(map));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -1,5 +1,6 @@
package com.bweb.controller.item;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode;
@ -8,11 +9,12 @@ import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.MathConfig;
import com.hfkj.entity.EnItem;
import com.hfkj.entity.EnOilDepots;
import com.hfkj.entity.*;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.service.item.EnItemSegmentsService;
import com.hfkj.service.item.EnOilDepotsService;
import com.hfkj.service.item.EnSerOilDepotsSgRelService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -39,6 +41,10 @@ public class EnOilDepotsController {
@Resource
private EnOilDepotsService enOilDepotsService;
@Resource
private EnSerOilDepotsSgRelService enSerOilDepotsSgRelService;
@Resource
private EnItemSegmentsService enItemSegmentsService;
@RequestMapping(value="/create",method = RequestMethod.POST)
@ResponseBody
@ -229,7 +235,7 @@ public class EnOilDepotsController {
@RequestMapping(value="/queryList",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询项目列表")
@ApiOperation(value = "查询列表")
public ResponseData queryList(@RequestParam(value = "itemId" , required = false) Long itemId,
@RequestParam(value = "oilDepotNo" , required = false) String oilDepotNo,
@RequestParam(value = "oilDepotName" , required = false) String oilDepotName,
@ -262,4 +268,91 @@ public class EnOilDepotsController {
}
}
@RequestMapping(value="/bindSegment",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "绑定项目段")
public ResponseData bindSegment(@RequestBody JSONObject body) {
try {
if (body == null
|| body.getLong("oilDepotsId") == null
|| StringUtils.isBlank(body.getString("segmentIds"))
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
enSerOilDepotsSgRelService.deleteAllByCompanyId(body.getLong("oilDepotsId") , false , sessionModel.getAccount().getId());
Map<String , Object > map = new HashMap<>();
map.put("id",body.getLong("oilDepotsId"));
map.put("createUser" , sessionModel.getAccount().getId());
EnOilDepots enOilDepots = enOilDepotsService.queryDetailByMap(map);
if (enOilDepots == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "油库不存在");
}
// 查询项目段
String[] segmentIds = body.getString("segmentIds").split(",");
for (String segmentId : segmentIds) {
map.put("id",segmentId);
EnItemSegments enItemSegments = enItemSegmentsService.queryDetailByMap(map);
if (enItemSegments != null) {
EnSerOilDepotsSgRel enSerOilDepotsSgRel = new EnSerOilDepotsSgRel();
enSerOilDepotsSgRel.setOilDepotsId(body.getLong("oilDepotsId"));
enSerOilDepotsSgRel.setOilDepotsName(enOilDepots.getOilDepotName());
enSerOilDepotsSgRel.setLatitude(enOilDepots.getLatitude());
enSerOilDepotsSgRel.setLongitude(enOilDepots.getLongitude());
enSerOilDepotsSgRel.setSegmentName(enItemSegments.getSegmentName());
enSerOilDepotsSgRel.setSegmentId(enItemSegments.getId());
enSerOilDepotsSgRel.setUpdateTime(new Date());
enSerOilDepotsSgRel.setCreateTime(new Date());
enSerOilDepotsSgRel.setCreateUser(sessionModel.getAccount().getId());
enSerOilDepotsSgRel.setStatus(1);
enSerOilDepotsSgRel.setCreateUserName(sessionModel.getAccount().getUserName());
enSerOilDepotsSgRelService.create(enSerOilDepotsSgRel);
}
}
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/querySgeOilDepotsList",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询项目段油库关联列表")
public ResponseData querySgeOilDepotsList(@RequestParam(value = "oilDepotsId" , required = false) Long oilDepotsId,
@RequestParam(value = "segmentId" , required = false) Long segmentId) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
Map<String,Object> param = new HashMap<>();
param.put("oilDepotsId", oilDepotsId);
param.put("segmentId", segmentId);
return ResponseMsgUtil.success(enSerOilDepotsSgRelService.getList(param));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -1,7 +1,9 @@
package com.bweb.controller.item;
import com.bweb.config.SysConst;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.QRCodeGenerator;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
@ -47,6 +49,7 @@ public class EnTransportCompanyCarController {
|| body.getOilTankCapacity() == null
|| StringUtils.isBlank(body.getContactInfo())
|| StringUtils.isBlank(body.getCarNo())
|| StringUtils.isBlank(body.getDeviceCode())
|| StringUtils.isBlank(body.getCredentialsImg())
|| StringUtils.isBlank(body.getPerson())
) {
@ -67,6 +70,18 @@ public class EnTransportCompanyCarController {
body.setCreateUserName(sessionModel.getAccount().getUserName());
enTransportCompanyCarService.create(body);
// 生成二维码
String url = "carId=";
String qrCodeImg = "carQrCode/" + body.getId()+".png";
String qrCodeUrl = "/home/project/en-server/filesystem/" + qrCodeImg;
QRCodeGenerator.generateQRCodeImage(url+body.getId(), 350, 350, qrCodeUrl);
body.setQrImg(qrCodeImg);
body.setTransportId(sessionModel.getAccount().getObjectId());
body.setUpdateUser(sessionModel.getAccount().getId());
body.setUpdateUserName(sessionModel.getAccount().getUserName());
enTransportCompanyCarService.update(body);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
@ -85,6 +100,7 @@ public class EnTransportCompanyCarController {
|| body.getCarType() == null
|| body.getOilTankCapacity() == null
|| StringUtils.isBlank(body.getCarNo())
|| StringUtils.isBlank(body.getDeviceCode())
|| StringUtils.isBlank(body.getCredentialsImg())
|| StringUtils.isBlank(body.getPerson())
) {
@ -196,7 +212,6 @@ public class EnTransportCompanyCarController {
param.put("carType", carType);
param.put("person", person);
param.put("status", status);
param.put("createUser", sessionModel.getAccount().getId());
PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(enTransportCompanyCarService.getList(param)));

@ -0,0 +1,116 @@
package com.bweb.controller.notify;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.entity.EnOrderOil;
import com.hfkj.service.aochengcloud.AoChengService;
import com.hfkj.service.order.EnOrderOilService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jacoco.agent.rt.internal_035b120.core.internal.flow.IFrame;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Controller
@RequestMapping(value = "/enNotify")
@Api(value = "奥城业务通知")
public class EnNotifyController {
private static final Logger log = LoggerFactory.getLogger(AoChengService.class);
@Resource
private EnOrderOilService enOrderOilService;
@RequestMapping(value = "/notify", method = RequestMethod.POST)
@ApiOperation(value = "回调")
@ResponseBody
public void notify(@RequestBody String reqBodyStr, HttpServletRequest request, HttpServletResponse response) {
try {
JSONObject dataObject = JSONObject.parseObject(reqBodyStr, JSONObject.class);
log.info("============回调任务Start=============");
log.info("奥城业务通知-回调参数: " + dataObject);
// 根据设备ID 查询加油订单
Map<String , Object> map = new HashMap<>();
map.put("deviceCode",dataObject.getString("deviceId"));
map.put("status",3);
EnOrderOil enOrderOil = enOrderOilService.queryDetailByMap(map);
if (enOrderOil == null) {
enOrderOil = new EnOrderOil();
enOrderOil.setDeviceCode(dataObject.getString("deviceId"));
enOrderOil.setThirdOrderNo(dataObject.getString("orderNo"));
}
//业务处理
if (dataObject.getString("status").equals("SUCCESS")) {
enOrderOil.setStatus(1);
enOrderOil.setNumber(dataObject.getLong("number"));
enOrderOil.setMode(dataObject.getInteger("mode"));
enOrderOil.setCardNo(dataObject.getString("cardNo"));
enOrderOil.setCardUserName(dataObject.getString("cardUserName"));
enOrderOil.setCardPlateNumber(dataObject.getString("cardPlateNumber"));
enOrderOil.setFillDateTime(dataObject.getDate("fillDateTime"));
if (dataObject.getLong("liter") != null) {
enOrderOil.setLiter(new BigDecimal(dataObject.getLong("liter")).divide(new BigDecimal(1000)));
}
if (dataObject.getLong("price") != null) {
enOrderOil.setPrice(new BigDecimal(dataObject.getLong("price")).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
}
if (dataObject.getLong("sale") != null) {
enOrderOil.setSale(new BigDecimal(dataObject.getLong("sale")).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
}
if (dataObject.getLong("cardBeforeConsumeMoney") != null) {
enOrderOil.setCardBeforeConsumeMoney(new BigDecimal(dataObject.getLong("cardBeforeConsumeMoney")).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
}
if (dataObject.getLong("cardAfterConsumeMoney") != null) {
enOrderOil.setCardAfterConsumeMoney(new BigDecimal(dataObject.getLong("cardAfterConsumeMoney")).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
}
}
if (dataObject.getString("status").equals("CANCEL")) {
enOrderOil.setStatus(2);
}
if(enOrderOil.getId() == null) {
enOrderOil.setCreateTime(new Date());
enOrderOilService.create(enOrderOil);
} else {
enOrderOil.setUpdateTime(new Date());
enOrderOilService.update(enOrderOil);
}
log.info("============回调任务End=============");
response.setCharacterEncoding("UTF-8");
response.setContentType("text/html;charset=utf-8");
PrintWriter writer= response.getWriter();
writer.write("SUCCESS");
} catch (Exception e) {
log.error("WechatPayController --> wechatNotify() error!", e);
}
}
}

@ -0,0 +1,559 @@
package com.bweb.controller.order;
import com.alibaba.fastjson.JSONObject;
import com.bweb.controller.item.EnServiceCompanyController;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.MathConfig;
import com.hfkj.entity.*;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.service.item.*;
import com.hfkj.service.order.EnOrderOilService;
import com.hfkj.service.order.EnOrderOpRecordService;
import com.hfkj.service.order.EnOrderService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping(value="/enOrder")
@Api(value="订单管理")
public class EnOrderController {
Logger log = LoggerFactory.getLogger(EnServiceCompanyController.class);
@Resource
private UserCenter userCenter;
@Resource
private EnOrderService enOrderService;
@Resource
private EnOrderOilService enOrderOilService;
@Resource
private EnSerOilDepotsSgRelService enSerOilDepotsSgRelService;
@Resource
private EnOrderOpRecordService enOrderOpRecordService;
@Resource
private EnTransportCompanyCarService enTransportCompanyCarService;
@Resource
private EnTransportCompanyService enTransportCompanyService;
@Resource
private EnItemSegmentsService enItemSegmentsService;
@Resource
private EnOilDepotsService enOilDepotsService;
@Resource
private EnServiceCompanyService enServiceCompanyService;
@Resource
private EnItemService enItemService;
@Resource
private EnServiceCompanyDeviceService enServiceCompanyDeviceService;
@RequestMapping(value="/reserveOrder",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "预约订单")
public ResponseData reserveOrder(@RequestBody EnOrder body) {
try {
if (body == null
|| body.getSegmentId() == null
|| body.getLatitude() == null
|| body.getLongitude() == null
|| body.getOilType() == null
|| body.getFuelQuantity() == null
|| body.getCarId() == null
|| StringUtils.isBlank(body.getDestination())
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询项目段
EnItemSegments segments = enItemSegmentsService.queryDetail(body.getSegmentId());
if (segments == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "项目段不存在!");
}
// 查询车辆状态
EnTransportCompanyCar companyCar = enTransportCompanyCarService.queryDetail(body.getCarId());
// 查询运输服务公司
EnTransportCompany enTransportCompany = enTransportCompanyService.queryDetail(companyCar.getTransportId());
if (enTransportCompany == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "运输服务公司不存在!");
}
if (enTransportCompany.getStatus() != 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "运输服务公司状态异常!");
}
if (companyCar == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "车辆不存在!");
}
if (companyCar.getStatus() != 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "车辆状态异常!");
}
// 查询车辆是否存在订单
EnOrder order = enOrderService.findOrder(body.getCarId());
if (order != null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前车辆已被预约,不可以预约!!");
}
body.setSegmentName(segments.getSegmentName());
body.setCarNo(companyCar.getCarNo());
body.setTransportCompanyId(enTransportCompany.getId());
body.setTransportCompanyName(enTransportCompany.getName());
body.setUpdateTime(new Date());
body.setOrderNo(MathConfig.generateEncoding(12));
body.setCreateTime(new Date());
body.setUpdateUserId(sessionModel.getAccount().getId());
body.setStatus(1);
body.setCreateUserName(sessionModel.getAccount().getUserName());
body.setCreateUserId(sessionModel.getAccount().getId());
enOrderService.create(body);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/modifyAppointment",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "修改预约")
public ResponseData modifyAppointment(@RequestBody JSONObject body) {
try {
if (body == null
|| body.getLong("carId") == null
|| body.getLong("orderId") == null
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type5.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询预约订单
EnOrder order = enOrderService.queryDetail(body.getLong("orderId"));
if (order == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单不存在!");
}
if (order.getStatus() != 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态不可以修改!");
}
// 查询车辆状态
EnTransportCompanyCar companyCar = enTransportCompanyCarService.queryDetail(body.getLong("carId"));
if (companyCar == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "车辆不存在!");
}
if (companyCar.getStatus() != 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "车辆状态异常!");
}
// 查询车辆是否存在订单
EnOrder orderCar = enOrderService.findOrder(body.getLong("carId"));
if (orderCar != null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前车辆已被预约,不可以预约!!");
}
// 添加记录
EnOrderOpRecord enOrderOpRecord = new EnOrderOpRecord();
enOrderOpRecord.setOrderNo(order.getOrderNo());
enOrderOpRecord.setOpRecord("时间" + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "修改预约");
enOrderOpRecord.setRemak("原车辆:"+order.getCarNo()+"修改为:" + companyCar.getCarNo());
enOrderOpRecord.setCreateTime(new Date());
enOrderOpRecord.setUpdateUserId(sessionModel.getAccount().getId());
enOrderOpRecord.setStatus(1);
enOrderOpRecord.setCreateUserName(sessionModel.getAccount().getUserName());
order.setCarId(body.getLong("carId"));
order.setCarNo(companyCar.getCarNo());
order.setUpdateTime(new Date());
order.setUpdateUserId(sessionModel.getAccount().getId());
order.setUpdateUserName(sessionModel.getAccount().getUserName());
enOrderService.update(order);
enOrderOpRecordService.create(enOrderOpRecord);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/confirmingAssignments",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "确认分配")
public ResponseData confirmingAssignments(@RequestParam(value = "orderId" , required = true) Long orderId) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type5.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询预约订单
EnOrder order = enOrderService.queryDetail(orderId);
if (order == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单不存在!");
}
if (order.getStatus() != 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态异常!");
}
// 添加记录
EnOrderOpRecord enOrderOpRecord = new EnOrderOpRecord();
enOrderOpRecord.setOrderNo(order.getOrderNo());
enOrderOpRecord.setOpRecord("时间" + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "确认分配");
enOrderOpRecord.setRemak("车辆:"+order.getCarNo()+"确认分配");
enOrderOpRecord.setCreateTime(new Date());
enOrderOpRecord.setUpdateUserId(sessionModel.getAccount().getId());
enOrderOpRecord.setStatus(1);
enOrderOpRecord.setCreateUserName(sessionModel.getAccount().getUserName());
order.setStatus(2);
order.setUpdateTime(new Date());
order.setUpdateUserId(sessionModel.getAccount().getId());
order.setUpdateUserName(sessionModel.getAccount().getUserName());
enOrderService.update(order);
enOrderOpRecordService.create(enOrderOpRecord);
return ResponseMsgUtil.success("成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/confirmDelivery",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "确认配送")
public ResponseData confirmDelivery(@RequestParam(value = "orderId" , required = true) Long orderId) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type6.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询预约订单
EnOrder order = enOrderService.queryDetail(orderId);
if (order == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单不存在!");
}
if (order.getStatus() != 2) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态异常!");
}
// 添加记录
EnOrderOpRecord enOrderOpRecord = new EnOrderOpRecord();
enOrderOpRecord.setOrderNo(order.getOrderNo());
enOrderOpRecord.setOpRecord("时间" + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "确认配送");
enOrderOpRecord.setRemak("车辆:"+order.getCarNo()+"确认配送");
enOrderOpRecord.setCreateTime(new Date());
enOrderOpRecord.setUpdateUserId(sessionModel.getAccount().getId());
enOrderOpRecord.setStatus(1);
enOrderOpRecord.setCreateUserName(sessionModel.getAccount().getUserName());
order.setStatus(3);
order.setUpdateTime(new Date());
order.setUpdateUserId(sessionModel.getAccount().getId());
order.setUpdateUserName(sessionModel.getAccount().getUserName());
enOrderService.update(order);
enOrderOpRecordService.create(enOrderOpRecord);
return ResponseMsgUtil.success("成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/completeDelivery",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "完成配送")
public ResponseData completeDelivery(@RequestParam(value = "orderId" , required = true) Long orderId) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type6.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询预约订单
EnOrder order = enOrderService.queryDetail(orderId);
if (order == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单不存在!");
}
if (order.getStatus() != 3) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态异常!");
}
// 添加记录
EnOrderOpRecord enOrderOpRecord = new EnOrderOpRecord();
enOrderOpRecord.setOrderNo(order.getOrderNo());
enOrderOpRecord.setOpRecord("时间" + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "完成配送");
enOrderOpRecord.setRemak("车辆:"+order.getCarNo()+"完成配送");
enOrderOpRecord.setCreateTime(new Date());
enOrderOpRecord.setUpdateUserId(sessionModel.getAccount().getId());
enOrderOpRecord.setStatus(1);
enOrderOpRecord.setCreateUserName(sessionModel.getAccount().getUserName());
order.setStatus(4);
order.setUpdateTime(new Date());
order.setUpdateUserId(sessionModel.getAccount().getId());
order.setUpdateUserName(sessionModel.getAccount().getUserName());
enOrderService.update(order);
enOrderOpRecordService.create(enOrderOpRecord);
return ResponseMsgUtil.success("成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryOrderList",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询列表")
public ResponseData queryOrderList(@RequestParam(value = "segmentId" , required = false) Long segmentId,
@RequestParam(value = "segmentName" , required = false) String segmentName,
@RequestParam(value = "oilType" , required = false) Integer oilType,
@RequestParam(value = "status" , required = false) Integer status,
@RequestParam(value = "orderNo" , required = false) String orderNo,
@RequestParam(value = "pageNum" , required = true) Integer pageNum,
@RequestParam(value = "pageSize" , required = true) Integer pageSize) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
Map<String,Object> param = new HashMap<>();
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type5.getCode())) {
param.put("transportCompanyId", sessionModel.getAccount().getObjectId());
}
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type6.getCode())) {
param.put("carId", sessionModel.getAccount().getObjectId());
}
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) {
param.put("createUserId", sessionModel.getAccount().getId());
}
param.put("segmentId", segmentId);
param.put("segmentName", segmentName);
param.put("oilType", oilType);
param.put("orderNo", orderNo);
param.put("status", status);
PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(enOrderService.getList(param)));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/availableOilDepots",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询可用油库")
public ResponseData availableOilDepots(@RequestParam(value = "segmentId" , required = false) Long segmentIde) {
try {
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type6.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
// 查询项目段管理油库表
Map<String , Object> map = new HashMap<>();
map.put("segmentId" , segmentIde);
List<EnSerOilDepotsSgRel> enSerOilDepotsSgRel = enSerOilDepotsSgRelService.getList(map);
return ResponseMsgUtil.success(enSerOilDepotsSgRel);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryDetailOrderByCarId",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "根据车辆ID查询订单详情")
public ResponseData queryDetailOrderByCarId(@RequestParam(value = "carId" , required = false) Long carId) {
try {
return ResponseMsgUtil.success(enOrderService.findOrder(carId));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/confirmRefueling",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "确认加油")
public ResponseData confirmRefueling(@RequestBody JSONObject body) {
try {
if (body == null
|| body.getLong("deviceId") == null
|| body.getLong("carId") == null
|| body.getLong("segmentId") == null
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
//查询车辆信息
EnTransportCompanyCar enCar = enTransportCompanyCarService.queryDetail(body.getLong("carId"));
if (enCar == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "车辆信息不存在");
}
// 查询运输公司信息
EnTransportCompany enTransportCompany = enTransportCompanyService.queryDetail(enCar.getTransportId());
if (enTransportCompany == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "运输服务公司异常");
}
// 查询项目段信息
EnItemSegments enSegment = enItemSegmentsService.queryDetail(body.getLong("segmentId"));
if (enSegment == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "项目段信息不存在");
}
// 查询项目
EnItem enItem = enItemService.queryDetail(enSegment.getItemId());
// 查询预约订单
EnOrder enOrder = enOrderService.findOrder(body.getLong("carId"));
//查询服务公司设备
EnServiceCompanyDevice companyDevice = enServiceCompanyDeviceService.queryDetail(body.getLong("deviceId"));
// 查询服务公司
EnServiceCompany enServiceCompany = enServiceCompanyService.queryDetail(companyDevice.getCompanyId());
if (companyDevice == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "服务公司设备不存在");
}
if (enOrder == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "预约订单不存在");
}
// 定义加油订单
EnOrderOil enOrderOil = new EnOrderOil();
enOrderOil.setOrderNo(enOrder.getOrderNo());
enOrderOil.setServiceCompanyDeviceCode(companyDevice.getDeviceNo());
enOrderOil.setServiceCompanyDeviceId(companyDevice.getId());
enOrderOil.setTransportCompanyId(enTransportCompany.getId());
enOrderOil.setTransportCompanyName(enTransportCompany.getName());
enOrderOil.setItemId(enItem.getId());
enOrderOil.setItemName(enItem.getProjectName());
enOrderOil.setCompanyId(enServiceCompany.getId());
enOrderOil.setCompanyName(enServiceCompany.getName());
enOrderOil.setSegmentId(enSegment.getId());
enOrderOil.setSegmentName(enSegment.getSegmentName());
enOrderOil.setOilType(enOrder.getOilType());
enOrderOil.setStatus(3);
enOrderOil.setCreateTime(new Date());
enOrderOil.setUpdateUserId(sessionModel.getAccount().getId());
enOrderOil.setCreateUserName(sessionModel.getAccount().getUserName());
enOrderOilService.create(enOrderOil);
return ResponseMsgUtil.success("成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -69,4 +69,27 @@
<logger name="com.hfkj" level="ERROR">
<appender-ref ref="errorlog" />
</logger>
<!--奥城加油机接口 -->
<appender name="AoChengLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/AoChengLog.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/AoChengLog/AoChengLog.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.service.aochengcloud.AoChengService" level="INFO">
<appender-ref ref="AoChengLog" />
</logger>
<!-- 奥城加油机接口 -->
</configuration>

@ -32,7 +32,7 @@ public class QRCodeGenerator {
public static void main(String[] args) {
try {
generateQRCodeImage("This is my first QR Code", 350, 350, "D:\\/ss/qr1.png");
generateQRCodeImage("This is my first QR Code", 350, 350, "D:\\img/qr1.png");
} catch (WriterException e) {
System.out.println("Could not generate QR Code, WriterException :: " + e.getMessage());
} catch (IOException e) {

@ -381,6 +381,45 @@ public class HttpsUtils {
return null;
}
public static JSONObject doPostAoCheng(String apiUrl, String str , Map<String,Object> header) {
CloseableHttpClient httpClient = null;
if (apiUrl.startsWith("https")) {
httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
.setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
} else {
httpClient = HttpClients.createDefault();
}
String httpStr = null;
CloseableHttpResponse response = null;
try {
HttpPost httpPost = new HttpPost(apiUrl);
httpPost.setConfig(requestConfig);
for (Map.Entry<String, Object> entry : header.entrySet()) {
httpPost.setHeader(entry.getKey(), entry.getValue().toString());
}
StringEntity stringEntity = new StringEntity(str, "UTF-8");// 解决中文乱码问题
stringEntity.setContentEncoding("UTF-8");
stringEntity.setContentType("application/json");
httpPost.setEntity(stringEntity);
response = httpClient.execute(httpPost);
HttpEntity entity = response.getEntity();
httpStr = EntityUtils.toString(entity, "UTF-8");
return JSON.parseObject(httpStr);
} catch (Exception e) {
log.error(e.getMessage(),e);
} finally {
if (response != null) {
try {
EntityUtils.consume(response.getEntity());
} catch (IOException e) {
log.error(e.getMessage(),e);
}
}
}
return null;
}
public static JSONObject doPostForm(String apiUrl, String body, Map<String,Object> header) {
CloseableHttpClient httpClient = null;

@ -42,19 +42,21 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper
"insert into en_transport_company_car (transport_id, car_no, ",
"car_type, credentials_img, ",
"person, contact_info, ",
"oil_tank_capacity, `status`, ",
"create_user, create_user_name, ",
"create_time, update_user, ",
"update_user_name, update_time, ",
"ext_1, ext_2, ext_3)",
"oil_tank_capacity, device_code, ",
"qr_img, `status`, create_user, ",
"create_user_name, create_time, ",
"update_user, update_user_name, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"values (#{transportId,jdbcType=BIGINT}, #{carNo,jdbcType=VARCHAR}, ",
"#{carType,jdbcType=INTEGER}, #{credentialsImg,jdbcType=VARCHAR}, ",
"#{person,jdbcType=VARCHAR}, #{contactInfo,jdbcType=VARCHAR}, ",
"#{oilTankCapacity,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ",
"#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, ",
"#{updateUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{oilTankCapacity,jdbcType=DECIMAL}, #{deviceCode,jdbcType=VARCHAR}, ",
"#{qrImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createUser,jdbcType=BIGINT}, ",
"#{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateUser,jdbcType=BIGINT}, #{updateUserName,jdbcType=VARCHAR}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(EnTransportCompanyCar record);
@ -73,6 +75,8 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper
@Result(column="person", property="person", jdbcType=JdbcType.VARCHAR),
@Result(column="contact_info", property="contactInfo", jdbcType=JdbcType.VARCHAR),
@Result(column="oil_tank_capacity", property="oilTankCapacity", jdbcType=JdbcType.DECIMAL),
@Result(column="device_code", property="deviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="qr_img", property="qrImg", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT),
@Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR),
@ -89,8 +93,8 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper
@Select({
"select",
"id, transport_id, car_no, car_type, credentials_img, person, contact_info, oil_tank_capacity, ",
"`status`, create_user, create_user_name, create_time, update_user, update_user_name, ",
"update_time, ext_1, ext_2, ext_3",
"device_code, qr_img, `status`, create_user, create_user_name, create_time, update_user, ",
"update_user_name, update_time, ext_1, ext_2, ext_3",
"from en_transport_company_car",
"where id = #{id,jdbcType=BIGINT}"
})
@ -103,6 +107,8 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper
@Result(column="person", property="person", jdbcType=JdbcType.VARCHAR),
@Result(column="contact_info", property="contactInfo", jdbcType=JdbcType.VARCHAR),
@Result(column="oil_tank_capacity", property="oilTankCapacity", jdbcType=JdbcType.DECIMAL),
@Result(column="device_code", property="deviceCode", jdbcType=JdbcType.VARCHAR),
@Result(column="qr_img", property="qrImg", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT),
@Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR),
@ -134,6 +140,8 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper
"person = #{person,jdbcType=VARCHAR},",
"contact_info = #{contactInfo,jdbcType=VARCHAR},",
"oil_tank_capacity = #{oilTankCapacity,jdbcType=DECIMAL},",
"device_code = #{deviceCode,jdbcType=VARCHAR},",
"qr_img = #{qrImg,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_user = #{createUser,jdbcType=BIGINT},",
"create_user_name = #{createUserName,jdbcType=VARCHAR},",

@ -56,6 +56,14 @@ public class EnTransportCompanyCarSqlProvider {
sql.VALUES("oil_tank_capacity", "#{oilTankCapacity,jdbcType=DECIMAL}");
}
if (record.getDeviceCode() != null) {
sql.VALUES("device_code", "#{deviceCode,jdbcType=VARCHAR}");
}
if (record.getQrImg() != null) {
sql.VALUES("qr_img", "#{qrImg,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
@ -113,6 +121,8 @@ public class EnTransportCompanyCarSqlProvider {
sql.SELECT("person");
sql.SELECT("contact_info");
sql.SELECT("oil_tank_capacity");
sql.SELECT("device_code");
sql.SELECT("qr_img");
sql.SELECT("`status`");
sql.SELECT("create_user");
sql.SELECT("create_user_name");
@ -172,6 +182,14 @@ public class EnTransportCompanyCarSqlProvider {
sql.SET("oil_tank_capacity = #{record.oilTankCapacity,jdbcType=DECIMAL}");
}
if (record.getDeviceCode() != null) {
sql.SET("device_code = #{record.deviceCode,jdbcType=VARCHAR}");
}
if (record.getQrImg() != null) {
sql.SET("qr_img = #{record.qrImg,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
@ -228,6 +246,8 @@ public class EnTransportCompanyCarSqlProvider {
sql.SET("person = #{record.person,jdbcType=VARCHAR}");
sql.SET("contact_info = #{record.contactInfo,jdbcType=VARCHAR}");
sql.SET("oil_tank_capacity = #{record.oilTankCapacity,jdbcType=DECIMAL}");
sql.SET("device_code = #{record.deviceCode,jdbcType=VARCHAR}");
sql.SET("qr_img = #{record.qrImg,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_user = #{record.createUser,jdbcType=BIGINT}");
sql.SET("create_user_name = #{record.createUserName,jdbcType=VARCHAR}");
@ -276,6 +296,14 @@ public class EnTransportCompanyCarSqlProvider {
sql.SET("oil_tank_capacity = #{oilTankCapacity,jdbcType=DECIMAL}");
}
if (record.getDeviceCode() != null) {
sql.SET("device_code = #{deviceCode,jdbcType=VARCHAR}");
}
if (record.getQrImg() != null) {
sql.SET("qr_img = #{qrImg,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}

@ -54,6 +54,16 @@ public class EnTransportCompanyCar implements Serializable {
*/
private BigDecimal oilTankCapacity;
/**
* 设备编号
*/
private String deviceCode;
/**
* 二维码图片
*/
private String qrImg;
/**
* 状态1:上班 2 下班 0 删除
*/
@ -170,6 +180,22 @@ public class EnTransportCompanyCar implements Serializable {
this.oilTankCapacity = oilTankCapacity;
}
public String getDeviceCode() {
return deviceCode;
}
public void setDeviceCode(String deviceCode) {
this.deviceCode = deviceCode;
}
public String getQrImg() {
return qrImg;
}
public void setQrImg(String qrImg) {
this.qrImg = qrImg;
}
public Integer getStatus() {
return status;
}
@ -270,6 +296,8 @@ public class EnTransportCompanyCar implements Serializable {
&& (this.getPerson() == null ? other.getPerson() == null : this.getPerson().equals(other.getPerson()))
&& (this.getContactInfo() == null ? other.getContactInfo() == null : this.getContactInfo().equals(other.getContactInfo()))
&& (this.getOilTankCapacity() == null ? other.getOilTankCapacity() == null : this.getOilTankCapacity().equals(other.getOilTankCapacity()))
&& (this.getDeviceCode() == null ? other.getDeviceCode() == null : this.getDeviceCode().equals(other.getDeviceCode()))
&& (this.getQrImg() == null ? other.getQrImg() == null : this.getQrImg().equals(other.getQrImg()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser()))
&& (this.getCreateUserName() == null ? other.getCreateUserName() == null : this.getCreateUserName().equals(other.getCreateUserName()))
@ -294,6 +322,8 @@ public class EnTransportCompanyCar implements Serializable {
result = prime * result + ((getPerson() == null) ? 0 : getPerson().hashCode());
result = prime * result + ((getContactInfo() == null) ? 0 : getContactInfo().hashCode());
result = prime * result + ((getOilTankCapacity() == null) ? 0 : getOilTankCapacity().hashCode());
result = prime * result + ((getDeviceCode() == null) ? 0 : getDeviceCode().hashCode());
result = prime * result + ((getQrImg() == null) ? 0 : getQrImg().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateUser() == null) ? 0 : getCreateUser().hashCode());
result = prime * result + ((getCreateUserName() == null) ? 0 : getCreateUserName().hashCode());
@ -321,6 +351,8 @@ public class EnTransportCompanyCar implements Serializable {
sb.append(", person=").append(person);
sb.append(", contactInfo=").append(contactInfo);
sb.append(", oilTankCapacity=").append(oilTankCapacity);
sb.append(", deviceCode=").append(deviceCode);
sb.append(", qrImg=").append(qrImg);
sb.append(", status=").append(status);
sb.append(", createUser=").append(createUser);
sb.append(", createUserName=").append(createUserName);

@ -646,6 +646,146 @@ public class EnTransportCompanyCarExample {
return (Criteria) this;
}
public Criteria andDeviceCodeIsNull() {
addCriterion("device_code is null");
return (Criteria) this;
}
public Criteria andDeviceCodeIsNotNull() {
addCriterion("device_code is not null");
return (Criteria) this;
}
public Criteria andDeviceCodeEqualTo(String value) {
addCriterion("device_code =", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeNotEqualTo(String value) {
addCriterion("device_code <>", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeGreaterThan(String value) {
addCriterion("device_code >", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeGreaterThanOrEqualTo(String value) {
addCriterion("device_code >=", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeLessThan(String value) {
addCriterion("device_code <", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeLessThanOrEqualTo(String value) {
addCriterion("device_code <=", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeLike(String value) {
addCriterion("device_code like", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeNotLike(String value) {
addCriterion("device_code not like", value, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeIn(List<String> values) {
addCriterion("device_code in", values, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeNotIn(List<String> values) {
addCriterion("device_code not in", values, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeBetween(String value1, String value2) {
addCriterion("device_code between", value1, value2, "deviceCode");
return (Criteria) this;
}
public Criteria andDeviceCodeNotBetween(String value1, String value2) {
addCriterion("device_code not between", value1, value2, "deviceCode");
return (Criteria) this;
}
public Criteria andQrImgIsNull() {
addCriterion("qr_img is null");
return (Criteria) this;
}
public Criteria andQrImgIsNotNull() {
addCriterion("qr_img is not null");
return (Criteria) this;
}
public Criteria andQrImgEqualTo(String value) {
addCriterion("qr_img =", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgNotEqualTo(String value) {
addCriterion("qr_img <>", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgGreaterThan(String value) {
addCriterion("qr_img >", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgGreaterThanOrEqualTo(String value) {
addCriterion("qr_img >=", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgLessThan(String value) {
addCriterion("qr_img <", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgLessThanOrEqualTo(String value) {
addCriterion("qr_img <=", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgLike(String value) {
addCriterion("qr_img like", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgNotLike(String value) {
addCriterion("qr_img not like", value, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgIn(List<String> values) {
addCriterion("qr_img in", values, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgNotIn(List<String> values) {
addCriterion("qr_img not in", values, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgBetween(String value1, String value2) {
addCriterion("qr_img between", value1, value2, "qrImg");
return (Criteria) this;
}
public Criteria andQrImgNotBetween(String value1, String value2) {
addCriterion("qr_img not between", value1, value2, "qrImg");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`status` is null");
return (Criteria) this;

@ -0,0 +1,180 @@
package com.hfkj.service.aochengcloud;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.common.utils.HttpsUtils;
import com.hfkj.config.CommonSysConst;
import netscape.javascript.JSObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.util.Map;
/**
* @ClassName AoChengService
* @Author Sum1Dream
* @Description
* @Date 2025/7/15 15:19
**/
public class AoChengService {
private static Logger log = LoggerFactory.getLogger(AoChengService.class);
private static String appId = "9HPADmwvwa1Qy5Xr";
private static String appSecret = "k8CEkWJEBQo6bvXPL36FNbtjcXxuP2MjbA0qa293sBer5Lu2";
private static String baseUrl = "http://open.aochengcloud.com/";
/**
* @MethodName createOrder
* @Description: 远程加注接
* @param param
* @return: com.alibaba.fastjson.JSONObject
* @Author: Sum1Dream
* @Date: 2025/7/16 09:37
*/
public static JSONObject createOrder(Map<String,Object> param) throws Exception {
return request(baseUrl + "device/createOrder", param);
}
/**
* @MethodName getDeviceGps
* @Description:获取设备GPS数据
* @param param
* @return: com.alibaba.fastjson.JSONObject
* @Author: Sum1Dream
* @Date: 2025/7/16 09:36
*/
public static JSONObject getDeviceGps(Map<String,Object> param) throws Exception {
return request(baseUrl + "device/getDeviceGps", param);
}
/**
* @MethodName getDeviceParams
* @Description: 设置设备实时参数
* @param param
* @return: com.alibaba.fastjson.JSONObject
* @Author: Sum1Dream
* @Date: 2025/7/16 09:34
*/
public static JSONObject setDeviceParams(Map<String,Object> param) throws Exception {
return request(baseUrl + "device/setDeviceParams", param);
}
/**
* @MethodName getDeviceParams
* @Description: 获取设备实时参数
* @param param
* @return: com.alibaba.fastjson.JSONObject
* @Author: Sum1Dream
* @Date: 2025/7/16 09:34
*/
public static JSONObject getDeviceParams(Map<String,Object> param) throws Exception {
return request(baseUrl + "device/getDeviceParams", param);
}
/**
* @MethodName getDeviceList
* @Description:查询设备列表
* @param param
* @return: com.alibaba.fastjson.JSONObject
* @Author: Sum1Dream
* @Date: 2025/7/16 09:13
*/
public static JSONObject getDeviceList(Map<String,Object> param) throws Exception {
return request(baseUrl + "device/findDeviceByPage", param);
}
private static JSONObject request(String postUrl, Map<String,Object> param) throws Exception {
log.info("============ 奥城请求-START =============");
Long timeStamp = new Date().getTime();
JSONObject paramMap = new JSONObject();
paramMap.put("X-APPID" , appId);
paramMap.put("X-TIMESTAMP" , timeStamp);
paramMap.put("X-SIGN" , getSign(timeStamp , JSONObject.toJSONString(param) , appId , appSecret));
log.info("请求接口:" + postUrl);
log.info("请求参数:" + JSONObject.toJSONString(param));
JSONObject response = HttpsUtils.doPostAoCheng(postUrl, JSONObject.toJSONString(param) , paramMap);
log.info("响应参数:" + response.toJSONString());
log.info("============ 奥城请求-END ==============");
return response;
}
/**
* @MethodName getSign
* @Description:生成加密文件
* @param timeStamp
* @param body
* @param appId
* @param appSecret
* @return: java.lang.String
* @Author: Sum1Dream
* @Date: 2025/7/16 09:13
*/
private static String getSign(long timeStamp, String body, String appId,
String appSecret) {
// 创建一个StringBuffer对象,用于拼接参数
StringBuffer buffer = new StringBuffer();
// 将appId参数拼接到buffer中
buffer.append("appId=" + appId);
// 将appSecret参数拼接到buffer中
buffer.append("&appSecret=" + appSecret);
// 将body参数拼接到buffer中
buffer.append("&body=" + body);
// 将timeStamp参数拼接到buffer中
buffer.append("&timeStamp=" + timeStamp);
// 对buffer中的字符串进行MD5加密,并转换为大写字母
return encryptMd5(buffer.toString()).toUpperCase();
}
/**
* @MethodName encryptMd5
* @Description: MD5加密
* @param sourceStr
* @return: java.lang.String
* @Author: Sum1Dream
* @Date: 2025/7/15 15:22
*/
private static String encryptMd5(String sourceStr) {
String result = "";
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(sourceStr.getBytes());
byte[] b = md.digest();
int i;
StringBuffer buf = new StringBuffer("");
for (int offset = 0; offset < b.length; offset++) {
i = b[offset];
if (i < 0) {
i += 256;
}
if (i < 16) {
buf.append("0");
}
buf.append(Integer.toHexString(i));
}
result = buf.toString();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
}
return result;
}
}

@ -0,0 +1,83 @@
package com.hfkj.service.item;
import com.hfkj.entity.EnSerCompanySgRel;
import com.hfkj.entity.EnSerOilDepotsSgRel;
import java.util.List;
import java.util.Map;
public interface EnSerOilDepotsSgRelService {
/**
* @MethodName create
* @Description:新增
* @param enSerOilDepotsSgRel
* @Author: Sum1Dream
* @Date: 2025/7/9 下午6:10
*/
void create(EnSerOilDepotsSgRel enSerOilDepotsSgRel);
/**
* @MethodName update
* @Description:修改
* @param enSerOilDepotsSgRel
* @Author: Sum1Dream
* @Date: 2025/7/9 下午6:10
*/
void update(EnSerOilDepotsSgRel enSerOilDepotsSgRel);
/**
* @MethodName delete
* @Description:删除
* @param id
* @param fullDelete
* @Author: Sum1Dream
* @Date: 2025/7/9 下午6:11
*/
void delete(Long id , Boolean fullDelete);
/**
* @MethodName deleteAllByCompanyId
* @Description:
* @param oilDepotsId
* @param fullDelete
* @param createUser
* @Author: Sum1Dream
* @Date: 2025/7/24 16:18
*/
void deleteAllByCompanyId(Long oilDepotsId , Boolean fullDelete , Long createUser);
/**
* @MethodName queryDetail
* @Description:查询详情
* @param id
* @return: com.hfkj.entity.EnSerOilDepotsSgRel
* @Author: Sum1Dream
* @Date: 2025/7/9 下午6:11
*/
EnSerOilDepotsSgRel queryDetail(Long id);
/**
* @MethodName queryDetailByMap
* @Description:根据多条件查询详情
* @param map
* @return: com.hfkj.entity.EnSerOilDepotsSgRel
* @Author: Sum1Dream
* @Date: 2025/7/9 下午6:11
*/
EnSerOilDepotsSgRel queryDetailByMap(Map<String , Object> map);
/**
* @MethodName getList
* @Description:查询列表
* @param map
* @return: java.util.List<com.hfkj.entity.EnSerOilDepotsSgRel>
* @Author: Sum1Dream
* @Date: 2025/7/9 下午6:11
*/
List<EnSerOilDepotsSgRel> getList(Map<String , Object> map);
}

@ -0,0 +1,127 @@
package com.hfkj.service.item.impl;
import com.hfkj.dao.EnSerOilDepotsSgRelMapper;
import com.hfkj.entity.*;
import com.hfkj.service.item.EnSerOilDepotsSgRelService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service("enSerOilDepotsSgRelService")
public class EnSerOilDepotsSgRelServiceImpl implements EnSerOilDepotsSgRelService {
@Resource
private EnSerOilDepotsSgRelMapper enSerOilDepotsSgRelMapper;
@Override
public void create(EnSerOilDepotsSgRel enSerOilDepotsSgRel) {
enSerOilDepotsSgRelMapper.insert(enSerOilDepotsSgRel);
}
@Override
public void update(EnSerOilDepotsSgRel enSerOilDepotsSgRel) {
enSerOilDepotsSgRelMapper.updateByPrimaryKey(enSerOilDepotsSgRel);
}
@Override
public void delete(Long id, Boolean fullDelete) {
if (fullDelete) {
enSerOilDepotsSgRelMapper.deleteByPrimaryKey(id);
} else {
EnSerOilDepotsSgRel enSerOilDepotsSgRel = queryDetail(id);
enSerOilDepotsSgRel.setStatus(0);
enSerOilDepotsSgRel.setUpdateTime(new Date());
update(enSerOilDepotsSgRel);
}
}
@Override
public void deleteAllByCompanyId(Long oilDepotsId, Boolean fullDelete, Long createUser) {
EnSerOilDepotsSgRelExample example = new EnSerOilDepotsSgRelExample();
EnSerOilDepotsSgRelExample.Criteria criteria = example.createCriteria();
criteria.andOilDepotsIdEqualTo(oilDepotsId).andStatusEqualTo(1);
List<EnSerOilDepotsSgRel> list = enSerOilDepotsSgRelMapper.selectByExample(example);
for (EnSerOilDepotsSgRel enSerOilDepotsSgRel : list) {
delete(enSerOilDepotsSgRel.getId() , fullDelete);
}
}
@Override
public EnSerOilDepotsSgRel queryDetail(Long id) {
return enSerOilDepotsSgRelMapper.selectByPrimaryKey(id);
}
@Override
public EnSerOilDepotsSgRel queryDetailByMap(Map<String, Object> map) {
EnSerOilDepotsSgRelExample example = new EnSerOilDepotsSgRelExample();
EnSerOilDepotsSgRelExample.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(MapUtils.getString(map, "oilDepotsName"))) {
criteria.andOilDepotsNameLike("%"+MapUtils.getString(map, "oilDepotsName")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (MapUtils.getLong(map , "oilDepotsId") != null) {
criteria.andOilDepotsIdEqualTo(MapUtils.getLong(map , "oilDepotsId"));
}
if (MapUtils.getLong(map , "segmentId") != null) {
criteria.andSegmentIdEqualTo(MapUtils.getLong(map , "segmentId"));
}
if (MapUtils.getLong(map, "createUser") != null) {
criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
List<EnSerOilDepotsSgRel> list = enSerOilDepotsSgRelMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
}
@Override
public List<EnSerOilDepotsSgRel> getList(Map<String, Object> map) {
EnSerOilDepotsSgRelExample example = new EnSerOilDepotsSgRelExample();
EnSerOilDepotsSgRelExample.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(MapUtils.getString(map, "oilDepotsName"))) {
criteria.andOilDepotsNameLike("%"+MapUtils.getString(map, "oilDepotsName")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (MapUtils.getLong(map , "oilDepotsId") != null) {
criteria.andOilDepotsIdEqualTo(MapUtils.getLong(map , "oilDepotsId"));
}
if (MapUtils.getLong(map , "segmentId") != null) {
criteria.andSegmentIdEqualTo(MapUtils.getLong(map , "segmentId"));
}
if (MapUtils.getLong(map, "createUser") != null) {
criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
return enSerOilDepotsSgRelMapper.selectByExample(example);
}
}

@ -15,10 +15,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service("enTransportCompanyCarService")
@ -87,6 +84,9 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe
return enTransportCompanyCarMapper.selectByPrimaryKey(id);
}
@Override
public EnTransportCompanyCar queryDetailByMap(Map<String, Object> map) {
EnTransportCompanyCarExample example = new EnTransportCompanyCarExample();

@ -0,0 +1,69 @@
package com.hfkj.service.order;
import com.hfkj.entity.EnOrder;
import com.hfkj.entity.EnOrderOil;
import java.util.List;
import java.util.Map;
public interface EnOrderOilService {
/**
* @MethodName create
* @Description: 创建
* @param enOrderOil
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void create(EnOrderOil enOrderOil) throws Exception ;
/**
* @MethodName update
* @Description:修改
* @param enOrderOil
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void update(EnOrderOil enOrderOil);
/**
* @MethodName delete
* @Description:删除
* @param id
* @param fullDelete
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void delete(Long id , Boolean fullDelete);
/**
* @MethodName queryDetail
* @Description:查询详情
* @param id
* @return: com.hfkj.entity.EnOrderOil
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
EnOrderOil queryDetail(Long id);
/**
* @MethodName queryDetailByMap
* @Description:根据多条件查询详情
* @param map
* @return: com.hfkj.entity.EnOrderOil
* @Author: Sum1Dream
* @Date: 2025/7/21 13:23
*/
EnOrderOil queryDetailByMap(Map<String , Object> map);
/**
* @MethodName getList
* @Description:查询列表
* @param map
* @return: java.util.List<com.hfkj.entity.EnOrderOil>
* @Author: Sum1Dream
* @Date: 2025/7/21 13:23
*/
List<EnOrderOil> getList(Map<String , Object> map);
}

@ -0,0 +1,67 @@
package com.hfkj.service.order;
import com.hfkj.entity.EnOrderOpRecord;
import java.util.List;
import java.util.Map;
public interface EnOrderOpRecordService {
/**
* @MethodName create
* @Description: 创建
* @param enOrderOpRecord
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void create(EnOrderOpRecord enOrderOpRecord) throws Exception ;
/**
* @MethodName update
* @Description:修改
* @param enOrderOpRecord
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void update(EnOrderOpRecord enOrderOpRecord);
/**
* @MethodName delete
* @Description:删除
* @param id
* @param fullDelete
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void delete(Long id , Boolean fullDelete);
/**
* @MethodName queryDetail
* @Description:查询详情
* @param id
* @return: com.hfkj.entity.enOrderOpRecord
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
EnOrderOpRecord queryDetail(Long id);
/**
* @MethodName queryDetailByMap
* @Description:根据多条件查询详情
* @param map
* @return: com.hfkj.entity.enOrderOpRecord
* @Author: Sum1Dream
* @Date: 2025/7/21 13:23
*/
EnOrderOpRecord queryDetailByMap(Map<String , Object> map);
/**
* @MethodName getList
* @Description:查询列表
* @param map
* @return: java.util.List<com.hfkj.entity.enOrderOpRecord>
* @Author: Sum1Dream
* @Date: 2025/7/21 13:23
*/
List<EnOrderOpRecord> getList(Map<String , Object> map);
}

@ -0,0 +1,71 @@
package com.hfkj.service.order;
import com.hfkj.entity.EnItem;
import com.hfkj.entity.EnOrder;
import java.util.List;
import java.util.Map;
public interface EnOrderService {
/**
* @MethodName create
* @Description: 创建
* @param enOrder
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void create(EnOrder enOrder) throws Exception ;
/**
* @MethodName update
* @Description:修改
* @param enOrder
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void update(EnOrder enOrder);
/**
* @MethodName delete
* @Description:删除
* @param id
* @param fullDelete
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
void delete(Long id , Boolean fullDelete);
/**
* @MethodName queryDetail
* @Description:查询详情
* @param id
* @return: com.hfkj.entity.EnOrder
* @Author: Sum1Dream
* @Date: 2025/7/21 13:22
*/
EnOrder queryDetail(Long id);
EnOrder findOrder(Long carId);
/**
* @MethodName queryDetailByMap
* @Description:根据多条件查询详情
* @param map
* @return: com.hfkj.entity.EnOrder
* @Author: Sum1Dream
* @Date: 2025/7/21 13:23
*/
EnOrder queryDetailByMap(Map<String , Object> map);
/**
* @MethodName getList
* @Description:查询列表
* @param map
* @return: java.util.List<com.hfkj.entity.EnOrder>
* @Author: Sum1Dream
* @Date: 2025/7/21 13:23
*/
List<EnOrder> getList(Map<String , Object> map);
}

@ -0,0 +1,177 @@
package com.hfkj.service.order.impl;
import com.hfkj.dao.EnOrderOilMapper;
import com.hfkj.entity.EnOrder;
import com.hfkj.entity.EnOrderOil;
import com.hfkj.entity.EnOrderOilExample;
import com.hfkj.entity.EnOrderOpRecord;
import com.hfkj.service.order.EnOrderOilService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service("enOrderOilService")
public class EnOrderOilServiceImpl implements EnOrderOilService {
@Resource
private EnOrderOilMapper enOrderOilMapper;
// 创建订单
@Override
public void create(EnOrderOil enOrderOil) throws Exception {
enOrderOilMapper.insert(enOrderOil);
}
// 更新订单
@Override
public void update(EnOrderOil enOrderOil) {
enOrderOilMapper.updateByPrimaryKey(enOrderOil);
}
// 删除订单
@Override
public void delete(Long id, Boolean fullDelete) {
EnOrderOil enOrderOil = queryDetail(id);
if (fullDelete) {
enOrderOilMapper.deleteByPrimaryKey(id);
} else {
enOrderOil.setStatus(0);
enOrderOil.setUpdateTime(new Date());
update(enOrderOil);
}
}
// 根据id查询订单详情
@Override
public EnOrderOil queryDetail(Long id) {
return enOrderOilMapper.selectByPrimaryKey(id);
}
// 根据map查询订单详情
@Override
public EnOrderOil queryDetailByMap(Map<String, Object> map) {
EnOrderOilExample example = new EnOrderOilExample();
EnOrderOilExample.Criteria criteria = example.createCriteria();
if (MapUtils.getLong(map, "segmentId") != null) {
criteria.andSegmentIdEqualTo(MapUtils.getLong(map, "segmentId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (MapUtils.getInteger(map, "oilType") != null) {
criteria.andOilTypeEqualTo(MapUtils.getInteger(map, "oilType"));
}
if (MapUtils.getLong(map, "deviceId") != null) {
criteria.andDeviceIdEqualTo(MapUtils.getLong(map, "deviceId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "deviceCode"))) {
criteria.andDeviceCodeLike("%"+MapUtils.getString(map, "deviceCode")+"%");
}
if (MapUtils.getInteger(map, "number") != null) {
criteria.andNumberEqualTo(MapUtils.getLong(map, "number"));
}
if (MapUtils.getLong(map, "carId") != null) {
criteria.andCarIdEqualTo(MapUtils.getLong(map, "carId"));
}
if (MapUtils.getInteger(map, "mode") != null) {
criteria.andModeEqualTo(MapUtils.getInteger(map, "mode"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "carNo"))) {
criteria.andCarNoLike("%"+MapUtils.getString(map, "carNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "cardNo"))) {
criteria.andCardNoEqualTo("%"+MapUtils.getString(map, "cardNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "thirdOrderNo"))) {
criteria.andThirdOrderNoEqualTo(MapUtils.getString(map, "thirdOrderNo"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "orderNo"))) {
criteria.andOrderNoEqualTo(MapUtils.getString(map, "orderNo"));
}
if (MapUtils.getLong(map, "createUserId") != null) {
criteria.andCreateUserIdEqualTo(MapUtils.getLong(map, "createUserId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnOrderOil> list = enOrderOilMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
}
// 根据map查询订单列表
@Override
public List<EnOrderOil> getList(Map<String, Object> map) {
EnOrderOilExample example = new EnOrderOilExample();
EnOrderOilExample.Criteria criteria = example.createCriteria();
if (MapUtils.getLong(map, "segmentId") != null) {
criteria.andSegmentIdEqualTo(MapUtils.getLong(map, "segmentId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (MapUtils.getInteger(map, "oilType") != null) {
criteria.andOilTypeEqualTo(MapUtils.getInteger(map, "oilType"));
}
if (MapUtils.getLong(map, "deviceId") != null) {
criteria.andDeviceIdEqualTo(MapUtils.getLong(map, "deviceId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "deviceCode"))) {
criteria.andDeviceCodeLike("%"+MapUtils.getString(map, "deviceCode")+"%");
}
if (MapUtils.getInteger(map, "number") != null) {
criteria.andNumberEqualTo(MapUtils.getLong(map, "number"));
}
if (MapUtils.getLong(map, "carId") != null) {
criteria.andCarIdEqualTo(MapUtils.getLong(map, "carId"));
}
if (MapUtils.getInteger(map, "mode") != null) {
criteria.andModeEqualTo(MapUtils.getInteger(map, "mode"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "carNo"))) {
criteria.andCarNoLike("%"+MapUtils.getString(map, "carNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "cardNo"))) {
criteria.andCardNoEqualTo("%"+MapUtils.getString(map, "cardNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "thirdOrderNo"))) {
criteria.andThirdOrderNoEqualTo(MapUtils.getString(map, "thirdOrderNo"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "orderNo"))) {
criteria.andOrderNoEqualTo(MapUtils.getString(map, "orderNo"));
}
if (MapUtils.getLong(map, "createUserId") != null) {
criteria.andCreateUserIdEqualTo(MapUtils.getLong(map, "createUserId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enOrderOilMapper.selectByExample(example);
}
}

@ -0,0 +1,97 @@
package com.hfkj.service.order.impl;
import com.hfkj.dao.EnOrderOpRecordMapper;
import com.hfkj.entity.EnOrderOpRecord;
import com.hfkj.entity.EnOrderOpRecordExample;
import com.hfkj.service.order.EnOrderOpRecordService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service("enOrderOpRecordService")
public class EnOrderOpRecordServiceImpl implements EnOrderOpRecordService {
@Resource
private EnOrderOpRecordMapper enOrderOpRecordMapper;
@Override
public void create(EnOrderOpRecord enOrderOpRecord) throws Exception {
enOrderOpRecordMapper.insert(enOrderOpRecord);
}
@Override
public void update(EnOrderOpRecord enOrderOpRecord) {
enOrderOpRecordMapper.updateByPrimaryKey(enOrderOpRecord);
}
@Override
public void delete(Long id, Boolean fullDelete) {
EnOrderOpRecord enOrderOpRecord = queryDetail(id);
if (fullDelete) {
enOrderOpRecordMapper.deleteByPrimaryKey(id);
} else {
enOrderOpRecord.setStatus(0);
enOrderOpRecord.setUpdateTime(new Date());
update(enOrderOpRecord);
}
}
@Override
public EnOrderOpRecord queryDetail(Long id) {
return enOrderOpRecordMapper.selectByPrimaryKey(id);
}
@Override
public EnOrderOpRecord queryDetailByMap(Map<String, Object> map) {
EnOrderOpRecordExample example = new EnOrderOpRecordExample();
EnOrderOpRecordExample.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(MapUtils.getString(map, "orderNo"))) {
criteria.andOrderNoEqualTo(MapUtils.getString(map, "orderNo"));
}
if (MapUtils.getLong(map, "createUserId") != null) {
criteria.andCreateUserIdEqualTo(MapUtils.getLong(map, "createUserId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnOrderOpRecord> list = enOrderOpRecordMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
}
@Override
public List<EnOrderOpRecord> getList(Map<String, Object> map) {
EnOrderOpRecordExample example = new EnOrderOpRecordExample();
EnOrderOpRecordExample.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(MapUtils.getString(map, "orderNo"))) {
criteria.andOrderNoEqualTo(MapUtils.getString(map, "orderNo"));
}
if (MapUtils.getLong(map, "createUserId") != null) {
criteria.andCreateUserIdEqualTo(MapUtils.getLong(map, "createUserId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enOrderOpRecordMapper.selectByExample(example);
}
}

@ -0,0 +1,148 @@
package com.hfkj.service.order.impl;
import com.hfkj.dao.EnOrderMapper;
import com.hfkj.entity.EnOrder;
import com.hfkj.entity.EnOrderExample;
import com.hfkj.service.order.EnOrderService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service("enOrderService")
public class EnOrderServiceImpl implements EnOrderService {
@Resource
private EnOrderMapper enOrderMapper;
@Override
public void create(EnOrder enOrder) throws Exception {
enOrderMapper.insert(enOrder);
}
@Override
public void update(EnOrder enOrder) {
enOrderMapper.updateByPrimaryKey(enOrder);
}
@Override
public void delete(Long id, Boolean fullDelete) {
EnOrder enOrder = queryDetail(id);
if (fullDelete) {
enOrderMapper.deleteByPrimaryKey(id);
} else {
enOrder.setStatus(0);
enOrder.setUpdateTime(new Date());
update(enOrder);
}
}
@Override
public EnOrder queryDetail(Long id) {
return enOrderMapper.selectByPrimaryKey(id);
}
@Override
public EnOrder findOrder(Long carId) {
EnOrderExample example = new EnOrderExample();
EnOrderExample.Criteria criteria = example.createCriteria();
List<Integer> statusList = Arrays.asList(1, 2, 3);
criteria.andStatusIn(statusList).andCarIdEqualTo(carId);
List<EnOrder> list = enOrderMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
}
@Override
public EnOrder queryDetailByMap(Map<String, Object> map) {
EnOrderExample example = new EnOrderExample();
EnOrderExample.Criteria criteria = example.createCriteria();
if (MapUtils.getLong(map, "segmentId") != null) {
criteria.andSegmentIdEqualTo(MapUtils.getLong(map, "segmentId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (MapUtils.getInteger(map, "oilType") != null) {
criteria.andOilTypeEqualTo(MapUtils.getInteger(map, "oilType"));
}
if (MapUtils.getLong(map, "carId") != null) {
criteria.andCarIdEqualTo(MapUtils.getLong(map, "carId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "carNo"))) {
criteria.andCarNoLike("%"+MapUtils.getString(map, "carNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "orderNo"))) {
criteria.andOrderNoEqualTo(MapUtils.getString(map, "orderNo"));
}
if (MapUtils.getLong(map, "createUserId") != null) {
criteria.andCreateUserIdEqualTo(MapUtils.getLong(map, "createUserId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
List<EnOrder> list = enOrderMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);
}
@Override
public List<EnOrder> getList(Map<String, Object> map) {
EnOrderExample example = new EnOrderExample();
EnOrderExample.Criteria criteria = example.createCriteria();
if (MapUtils.getLong(map, "segmentId") != null) {
criteria.andSegmentIdEqualTo(MapUtils.getLong(map, "segmentId"));
}
if (MapUtils.getLong(map, "transportCompanyId") != null) {
criteria.andTransportCompanyIdEqualTo(MapUtils.getLong(map, "transportCompanyId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) {
criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%");
}
if (MapUtils.getInteger(map, "oilType") != null) {
criteria.andOilTypeEqualTo(MapUtils.getInteger(map, "oilType"));
}
if (MapUtils.getLong(map, "carId") != null) {
criteria.andCarIdEqualTo(MapUtils.getLong(map, "carId"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "carNo"))) {
criteria.andCarNoLike("%"+MapUtils.getString(map, "carNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "orderNo"))) {
criteria.andOrderNoEqualTo(MapUtils.getString(map, "orderNo"));
}
if (MapUtils.getLong(map, "createUserId") != null) {
criteria.andCreateUserIdEqualTo(MapUtils.getLong(map, "createUserId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {
criteria.andStatusNotEqualTo(0);
}
if (MapUtils.getLong(map , "id") != null) {
criteria.andIdEqualTo(MapUtils.getLong(map , "id"));
}
example.setOrderByClause("create_time desc");
return enOrderMapper.selectByExample(example);
}
}
Loading…
Cancel
Save