diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcEquipmenMonitorController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcEquipmenMonitorController.java index 1a3a8e73..7e3689fa 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcEquipmenMonitorController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcEquipmenMonitorController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java index c690d94e..6ac662d4 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java @@ -81,6 +81,6 @@ public interface PileOrderService { * @return */ @GetMapping("/chargeOrder/pileVin") - R pileVin(@RequestParam(value = "serialNumber") String serialNumber,@RequestParam String vinNumber); + R pileVin(@RequestParam(value = "serialNumber") String serialNumber,@RequestParam(value = "vinNumber") String vinNumber); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcPileRegularInspectController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcPileRegularInspectController.java index 35d50db4..25c868ab 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcPileRegularInspectController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcPileRegularInspectController.java @@ -5,6 +5,7 @@ import com.xhpc.order.domain.XhpcPileRegularInspect; import com.xhpc.order.service.IXhpcPileRegularInspectService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; @RestController @@ -33,4 +34,20 @@ public class XhpcPileRegularInspectController extends BaseController { } + //版本号定时任务 + @GetMapping("/getVersionTimer") + @Scheduled(cron = "0 0/1 * * * ?") + public void getVersionTimer() + { + + + } + + + + //校时效价定时任务 + + //费率定时任务 + + //定期抄发管理员定时任务 } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcPileRegularInspectService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcPileRegularInspectService.java index 2aade8e5..bdcfce5a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcPileRegularInspectService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcPileRegularInspectService.java @@ -9,4 +9,6 @@ public interface IXhpcPileRegularInspectService { AjaxResult getPileRegularInspectTenantId(); AjaxResult addPileRegularInspect(XhpcPileRegularInspect xhpcPileRegularInspect); + + void getVersionTimer(); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java index 820c27a0..25cd0a77 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java @@ -102,9 +102,9 @@ public class XhpcPileRegularInspectServiceImpl extends BaseService implements IX }catch (Exception e){ return AjaxResult.error(500, "费率格式不对"); } + //验证是否有重复的桩添加版本号 if(xhpcPileRegularInspect.getPileRegularInspectId()==null){ - Map map = xhpcPileRegularInspectMapper.getPileRegularInspectTenantId(tenantId); if(map !=null){ return AjaxResult.error(500, "请重新登录!"); @@ -123,4 +123,9 @@ public class XhpcPileRegularInspectServiceImpl extends BaseService implements IX return AjaxResult.error(500, "请重新登录"); } } + + @Override + public void getVersionTimer() { + //获取 + } }