增加大屏的月度件量趋势统计，增加事业线的配载件量趋势结构

blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java

@@ -12,6 +12,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -36,7 +37,7 @@ public class LargeScreenController{
 	/**
 	 * 开单数据
 	 */
-	@GetMapping("/billingData")
+	@RequestMapping(value = "/billingData", method = {RequestMethod.GET, RequestMethod.POST})
 	public R<BillingDataVO> billingData(){
 		return R.data(billingDataService.getBillingData());
 	}
@@ -44,7 +45,7 @@ public class LargeScreenController{
 	/**
 	 * 目的仓开单数据
 	 */
-	@GetMapping("/warehouseBillingData")
+	@RequestMapping(value = "/warehouseBillingData", method = {RequestMethod.GET, RequestMethod.POST})
 	public R<List<WarehouseBillingDataVO>> getBillingData(){
 		return R.data(billingDataService.getWarehouseBillingData());
 	}
@@ -56,4 +57,12 @@ public class LargeScreenController{
 	public R<List<MonthBillingDataVO>> getMonthBillingData(){
 		return R.data(billingDataService.getMonthBillingData());
 	}
+
+	/**
+	 * 事业线配载件量趋势
+	 */
+	@GetMapping("/careerLineData")
+	public R<List<MonthBillingDataVO>> getCareerLineData(){
+		return R.data(billingDataService.getMonthBillingData());
+	}
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/CarsLoadDataMapper.java

@@ -0,0 +1,14 @@
+package com.logpm.report.mapper.largeScreen;
+
+
+import com.logpm.report.vo.largeScreen.CareerLineData.CareerLineInfoVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface CarsLoadDataMapper {
+	public List<CareerLineInfoVO> getCareerLineInfo();
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/CarsLoadDataMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.logpm.report.mapper.largeScreen.CarsLoadDataMapper">
+    <select id="getCareerLineInfo"
+            resultType="com.logpm.report.vo.largeScreen.CareerLineData.CareerLineInfoVO">
+        SELECT id,
+               dept_name as deptName
+        FROM logpm.blade_dept
+        WHERE dept_category = 2 AND dept_name like '%事业线%'
+    </select>
+</mapper>

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/ICarsLoadDataService.java

@@ -0,0 +1,15 @@
+package com.logpm.report.service.largeScreen;
+
+
+import com.logpm.report.vo.largeScreen.CareerLineDataVO;
+
+import java.util.List;
+
+/**
+ * 配载数据
+ */
+public interface ICarsLoadDataService {
+
+
+	public List<CareerLineDataVO> getCareerLineData();
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java

@@ -0,0 +1,29 @@
+package com.logpm.report.service.largeScreen.impl;
+
+import com.logpm.report.mapper.largeScreen.CarsLoadDataMapper;
+import com.logpm.report.service.largeScreen.ICarsLoadDataService;
+import com.logpm.report.vo.largeScreen.CareerLineData.CareerLineInfoVO;
+import com.logpm.report.vo.largeScreen.CareerLineDataVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+@Log4j2
+public class CarsLoadDataServiceImpl implements ICarsLoadDataService {
+
+	private CarsLoadDataMapper carsLoadDataMapper;
+
+	@Override
+	public List<CareerLineDataVO> getCareerLineData() {
+
+		List<CareerLineInfoVO> careerLineInfo = carsLoadDataMapper.getCareerLineInfo();
+
+
+		return Collections.emptyList();
+	}
+}

blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/BinLocationDataVO.java

@@ -0,0 +1,34 @@
+package com.logpm.report.vo.largeScreen;
+
+
+import lombok.Data;
+
+/**
+ * 库位信息
+ */
+@Data
+public class BinLocationDataVO {
+	/**
+	 *订单数量
+	 */
+	private Integer orderNum;
+	/**
+	 * 包裹数量
+	 */
+	private Integer packageNum;
+
+	/**
+	 * 库位数量
+	 */
+	private Integer binLocationNum;
+
+	/**
+	 * 使用库位数量
+	 */
+	private Integer useBinLocationNum;
+
+	/**
+	 * 空闲库位数量
+	 */
+	private Integer idleBinLocationNum;
+}

blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/CareerLineData/CareerLineInfoVO.java

@@ -0,0 +1,11 @@
+package com.logpm.report.vo.largeScreen.CareerLineData;
+
+
+import lombok.Data;
+
+@Data
+public class CareerLineInfoVO {
+	public String deptName;
+
+	public Long id;
+}

blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/CareerLineDataVO.java

@@ -0,0 +1,7 @@
+package com.logpm.report.vo.largeScreen;
+
+/**
+ * 事业线车辆配载数据
+ */
+public class CareerLineDataVO {
+}

blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/DeliveryDataVO.java

@@ -0,0 +1,14 @@
+package com.logpm.report.vo.largeScreen;
+
+
+import lombok.Data;
+
+/**
+ * 配送数据
+ */
+@Data
+public class DeliveryDataVO {
+	/**
+	 * 配送总数
+	 */
+}

blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/NodeDataVO.java

@@ -0,0 +1,30 @@
+package com.logpm.report.vo.largeScreen;
+
+import lombok.Data;
+
+/**
+ * 节点数据
+ */
+@Data
+public class NodeDataVO {
+	/**
+	 * 开单数量
+	 */
+	private Integer waybill;
+	/**
+	 * 配载装车数量
+	 */
+	private Integer carsLoadLoading;
+	/**
+	 * 配送装车数量
+	 */
+	private Integer deliveryLading;
+	/**
+	 * 到达数量
+	 */
+	private Integer arrival;
+	/**
+	 * 签收数量
+	 */
+	private Integer sign;
+}

blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/TrunkDataVO.java

@@ -0,0 +1,22 @@
+package com.logpm.report.vo.largeScreen;
+
+import lombok.Data;
+
+/**
+ * 干线数据
+ */
+@Data
+public class TrunkDataVO {
+	/**
+	 * 总车次数
+	 */
+	private Integer total;
+	/**
+	 * 在途
+	 */
+	private Integer onTheWay;
+	/**
+	 * 到达
+	 */
+	private Integer arrival;
+}