去掉无用依赖

blade-ops/blade-report/pom.xml

@@ -44,31 +44,6 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-stock-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-deliver-goods-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-land-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-purchase-sales-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

blade-ops/blade-report/src/main/java/org/springblade/report/ureport/DeliveryBean.java

@@ -1,79 +0,0 @@
-package org.springblade.report.ureport;
-
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springblade.deliver.goods.entity.Delivery;
-import org.springblade.deliver.goods.feign.IDeliveryReportClient;
-import org.springblade.deliver.goods.vo.DeliveryReportVO;
-import org.springblade.report.util.ParamUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@AllArgsConstructor
-public class DeliveryBean {
-
-	private final IDeliveryReportClient reportClient;
-
-	public List<DeliveryReportVO> loadCommissionData(String dsName, String datasetName, Map<String, Object> params) {
-		Integer year = ParamUtil.getInteger(params.get("year"));
-		String quarter = ParamUtil.getString(params.get("quarter"));
-		String userType = ParamUtil.getString(params.get("userType"));
-		Long goodsId = ParamUtil.getLong(params.get("goodsId"));
-		Long userId = ParamUtil.getLong(params.get("userId"));
-		String tenantId = ParamUtil.getString(params.get("tenantId"));
-
-		if (year == null || StringUtils.isBlank(quarter) || StringUtils.isBlank(userType) || goodsId == null) {
-			return new ArrayList<DeliveryReportVO>() {{
-				this.add(new DeliveryReportVO());
-			}};
-		}
-
-		DeliveryReportVO reportVO = new DeliveryReportVO();
-		reportVO.setYear(year);
-		reportVO.setQuarter(quarter);
-		reportVO.setUserId(userId);
-		reportVO.setGoodsId(goodsId);
-		reportVO.setUserType(userType);
-		reportVO.setTenantId(tenantId);
-		return reportClient.commission(reportVO).getData();
-	}
-
-	public List<Delivery> loadApprovalData(String dsName, String datasetName, Map<String, Object> params) {
-		String orgOrderNo = ParamUtil.getString(params.get("orgOrderNo"));
-		Long corpId = ParamUtil.getLong(params.get("corpId"));
-		Long salesCompany = ParamUtil.getLong(params.get("salesCompany"));
-		Long storageId = ParamUtil.getLong(params.get("storageId"));
-		String arrivalAddress = ParamUtil.getString(params.get("arrivalAddress"));
-		String arrivalContact = ParamUtil.getString(params.get("arrivalContact"));
-		String arrivalTel = ParamUtil.getString(params.get("arrivalTel"));
-		Long createUser = ParamUtil.getLong(params.get("createUser"));
-		String businessStartDate = ParamUtil.getString(params.get("businessStartDate"));
-		String businessEndDate = ParamUtil.getString(params.get("businessEndDate"));
-		String createTimeStart = ParamUtil.getString(params.get("createTimeStart"));
-		String createTimeEnd = ParamUtil.getString(params.get("createTimeEnd"));
-		String billType = ParamUtil.getString(params.get("billType"));
-		String tenantId = ParamUtil.getString(params.get("tenantId"));
-
-		Delivery delivery = new Delivery();
-		delivery.setOrgOrderNo(orgOrderNo);
-		delivery.setCorpId(corpId);
-		delivery.setSalesCompany(salesCompany);
-		delivery.setStorageId(storageId);
-		delivery.setArrivalAddress(arrivalAddress);
-		delivery.setArrivalContact(arrivalContact);
-		delivery.setArrivalTel(arrivalTel);
-		delivery.setCreateUser(createUser);
-		delivery.setBusinessStartDate(businessStartDate);
-		delivery.setBusinessEndDate(businessEndDate);
-		delivery.setCreateStartTime(createTimeStart);
-		delivery.setCreateEndTime(createTimeEnd);
-		delivery.setBillType(billType);
-		delivery.setTenantId(tenantId);
-		return reportClient.approval(delivery).getData();
-	}
-
-}

blade-ops/blade-report/src/main/java/org/springblade/report/ureport/LandBean.java

@@ -1,48 +0,0 @@
-package org.springblade.report.ureport;
-
-import lombok.AllArgsConstructor;
-import org.springblade.land.entity.OrderItem;
-import org.springblade.land.feign.ILandClient;
-import org.springblade.report.util.ParamUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component
-@AllArgsConstructor
-public class LandBean {
-
-	private final ILandClient landClient;
-
-	public List<OrderItem> loadLandItemData(String dsName, String datasetName, Map<String, Object> params) {
-		String orderNo = ParamUtil.getString(params.get("orderNo"));
-		Long corpId = ParamUtil.getLong(params.get("corpId"));
-		String addressDetail = ParamUtil.getString(params.get("addressDetail"));
-		String billNo = ParamUtil.getString(params.get("billNo"));
-		String ctnType = ParamUtil.getString(params.get("ctnType"));
-		Long fleetId = ParamUtil.getLong(params.get("fleetId"));
-		Long vehicleId = ParamUtil.getLong(params.get("vehicleId"));
-		Long driverId = ParamUtil.getLong(params.get("driverId"));
-		String tel = ParamUtil.getString(params.get("tel"));
-		String beginArrivalTime = ParamUtil.getString(params.get("beginArrivalTime"));
-		String endArrivalTime = ParamUtil.getString(params.get("endArrivalTime"));
-		String tenantId = ParamUtil.getString(params.get("tenantId"));
-
-		OrderItem item = new OrderItem();
-		item.setOrderNo(orderNo);
-		item.setCorpId(corpId);
-		item.setAddressDetail(addressDetail);
-		item.setBillNo(billNo);
-		item.setCtnType(ctnType);
-		item.setFleetId(fleetId);
-		item.setVehicleId(vehicleId);
-		item.setDriverId(driverId);
-		item.setTel(tel);
-		item.setBeginArrivalTime(beginArrivalTime);
-		item.setEndArrivalTime(endArrivalTime);
-		item.setTenantId(tenantId);
-		item.setTag(0);
-		return landClient.listReport(item).getData();
-	}
-}

blade-ops/blade-report/src/main/java/org/springblade/report/ureport/ProjectBean.java

@@ -25,8 +25,7 @@ public class ProjectBean {
 		String payEndTime = (String) parameters.get("payEndTime");
 		String tenantId = (String) parameters.get("tenantId");
 
-		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(tenantId.trim(), userName.trim(), projectType.trim(), deptid.trim(), pname.trim(), status.trim(), cornId.trim(), payStartTime.trim(), payEndTime.trim());
-		return serviceProjectItems;
+		return serviceProjectItemService.statisticalAnalysis(tenantId.trim(), userName.trim(), projectType.trim(), deptid.trim(), pname.trim(), status.trim(), cornId.trim(), payStartTime.trim(), payEndTime.trim());
 	}
 
 

blade-ops/blade-report/src/main/java/org/springblade/report/ureport/StockBean.java

@@ -1,49 +0,0 @@
-package org.springblade.report.ureport;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.AllArgsConstructor;
-import org.springblade.core.tool.api.R;
-import org.springblade.stock.entity.StockGoods;
-import org.springblade.stock.feign.IStockGoodsClient;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@AllArgsConstructor
-public class StockBean {
-
-
-	private IStockGoodsClient stockGoodsClient;
-
-	public List<StockGoods> load(String dsName, String datasetName, Map<String, Object> parameters) {
-
-		String code = parameters.get("code") == null ? null : (String) parameters.get("code");
-		String cname = parameters.get("cname") == null ? null : (String) parameters.get("cname");
-		String brandItem = parameters.get("brandItem") == null ? null : (String) parameters.get("brandItem");
-		String placeProduction = parameters.get("placeProduction") == null ? null : (String) parameters.get("placeProduction");
-		String typeno = parameters.get("typeno") == null ? null : (String) parameters.get("typeno");
-		String typenoOne = parameters.get("typenoOne") == null ? null : (String) parameters.get("typenoOne");
-		String typenoTwo = parameters.get("typenoTwo") == null ? null : (String) parameters.get("typenoTwo");
-		String stockName = parameters.get("stockName") == null ? null : (String) parameters.get("stockName");
-		String brand = parameters.get("brand") == null ? null : (String) parameters.get("brand");
-		String tenantId = parameters.get("tenantId") == null ? null : (String) parameters.get("tenantId");
-		String createStartTime = parameters.get("createStartTime") == null ? null : (String) parameters.get("createStartTime");
-		String createEndTime = parameters.get("createEndTime") == null ? null : (String) parameters.get("createEndTime");
-		String size = parameters.get("size") == null ? null : (String) parameters.get("size");
-		String current = parameters.get("current") == null ? null : (String) parameters.get("current");
-
-		return stockGoodsClient.list(code, cname, brandItem, placeProduction, typeno, typenoOne, typenoTwo, stockName, brand, tenantId, createStartTime, createEndTime, size, current);
-
-		/*List<StockGoods> list2=new ArrayList<>();
-		StockGoods s1=new StockGoods();
-		s1.setCode("111111");
-		list2.add(s1);
-		StockGoods s2=new StockGoods();
-		s2.setCode("222222");
-		list2.add(s2);*/
-
-	}
-}

blade-service-api/blade-client-api/pom.xml

@@ -29,24 +29,6 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-mocha-item-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-stock-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-purchase-sales-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 

blade-service/blade-check/pom.xml

@@ -38,11 +38,6 @@
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>trade-finance-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
@@ -70,71 +65,6 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>store-goods-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-check-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-purchase-sales-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-project-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-school-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>trade-purchase-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-mocha-item-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-box-tube-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-land-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-sales-part-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-sales-part-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 

blade-service/blade-client/pom.xml

@@ -115,30 +115,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-stock-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-purchase-sales-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>trade-finance-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-mocha-item-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-mp</artifactId>
             <version>2.9.0</version>
@@ -155,24 +131,6 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-payment-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-mocha-item</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-sales-part-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>