跑起来1

conf/application-ddWebOne.xml

@@ -128,13 +128,6 @@
                 <dao value="com.dderp.business.dao.LoginDao"/>
                 <dao value="com.dderp.business.dao.SystemDao"/>
                 <dao value="com.dderp.business.dao.DocDao"/>
-                <dao value="com.dderp.business.dao.ProductDao"/>
-                <dao value="com.dderp.business.dao.ClientDao"/>
-                <dao value="com.dderp.business.dao.OutAssistDao"/>
-                <dao value="com.dderp.business.dao.SupplierDao"/>
-                <dao value="com.dderp.business.dao.MaterialDao"/>
-                <dao value="com.dderp.business.dao.PaperDao"/>
-<!--                <dao value="com.dderp.business.dao.OrderDao"/>-->
             </service>
 
             <service value="com.dySweetFishPlugin.redis.jobqueue.RedisJQService" groups="ERP_SERVICE_REMOTE"/>
@@ -149,7 +142,7 @@
 
             <service value="com.dySweetFishPlugin.elasticsearch.ESClient" groups="ERP_SERVICE_REMOTE">
                 <clusterName value="elasticsearch"/>
-                <host value="192.168.1.248"/>
+                <host value="192.168.1.243"/>
                 <port value="9300"/>
             </service>
 
@@ -202,7 +195,6 @@
             <service value="com.dderp.business.service.SystemServiceImpl" groups="ERP_SERVICE_REMOTE">
                 <master value="true"/>
                 <isUseScriptService value="true"/>
-                <preCompiler value="1000/business/BE_System_TestListExt.groovy"/>
             </service>
 
             <service value="com.dderp.business.service.LoginServiceImpl" groups="ERP_SERVICE_REMOTE">

conf/redis.properties

@@ -6,7 +6,7 @@ redis.timeout=3000
 # redis url接口以";"分割多个地址
 # 阿里云 centos redis地址
 #139.129.245.104:6379
-redis.jedisPoolConfig.urls=192.168.1.248:6379
+redis.jedisPoolConfig.urls=192.168.1.243:6379
 redis.jedisPoolConfig.password=Admin@dounengyin@123
 #redis.jedisPoolConfig.password=
 

conf/script/1000/business/BE_DocClearScriptCache.groovy

@@ -1,8 +1,6 @@
 import com.dderp.common.api.BusinessExecutor
 import com.dderp.common.api.DocInfoService
 import com.dderp.common.api.SystemService
-import com.dderp.common.api.erp.OrderService
-import com.dderp.common.api.erp.ProductService
 import com.dderp.common.datas.ERPModule
 import com.dderp.common.datas.ERPModuleEntity
 import com.dderp.common.entity.base.BusinessOperation
@@ -29,12 +27,6 @@ class BE_DocClearScriptCache implements BusinessExecutor<ProcessEntityItem<ERPMo
     @Resource
     DocInfoService docInfoService
 
-    @Resource
-    ProductService productService
-
-    @Resource
-    OrderService orderService
-
     @Override
     String scriptName() {
         return "保存业务脚本清除对象"
@@ -56,8 +48,6 @@ class BE_DocClearScriptCache implements BusinessExecutor<ProcessEntityItem<ERPMo
             //2024-01-26未测试这个重载能不能不重启给groovy增加扩展方法，需要测试，不过理论上没啥用，因为Init_ExpandoGroovy的脚本是用的其它groovy代码实现的，先这样吧，留着以后处理，暂时不经常修改GroovyExtensions代码算了
             systemService.reloadScriptCache(source.inputItem.code, ERPModule.SYSTEM, source.dataSourceId, source.supplierCode)
             docInfoService.reloadScriptCache(source.inputItem.code, ERPModule.SYSTEM, source.dataSourceId, source.supplierCode)
-            productService.reloadScriptCache(source.inputItem.code, ERPModule.SYSTEM, source.dataSourceId, source.supplierCode)
-            orderService.reloadScriptCache(source.inputItem.code, ERPModule.SYSTEM, source.dataSourceId, source.supplierCode)
         }
         else {
             switch (erpModule) {
@@ -84,20 +74,6 @@ class BE_DocClearScriptCache implements BusinessExecutor<ProcessEntityItem<ERPMo
                         systemService.reloadScriptCache(source.getInputItem().getCode(), erpModule, source.getDataSourceId(), source.getSupplierCode())
                     }
                     break
-                case [ERPModule.PRODUCT, ERPModule.PRODUCT_QUOTE]:
-                    if (source.getOperation() == BusinessOperation.SAVE) {
-                        productService.invalidateScriptCache(source.getSupplierCode() + "-" + source.getInputItem().getCode())
-                    } else {
-                        productService.reloadScriptCache(source.getInputItem().getCode(), erpModule, source.getDataSourceId(), source.getSupplierCode())
-                    }
-                    break
-                case [ERPModule.ERP_ORDER, ERPModule.ERP_ORDER_SEARCH]:
-                    if (source.getOperation() == BusinessOperation.SAVE) {
-                        orderService.invalidateScriptCache(source.getSupplierCode() + "-" + source.getInputItem().getCode())
-                    } else {
-                        orderService.reloadScriptCache(source.getInputItem().getCode(), erpModule, source.getDataSourceId(), source.getSupplierCode())
-                    }
-                    break
                 case ERPModule.ADDRESSPARSER:
                     break
                 case ERPModule.APP:

conf/script/1000/business/BE_IndexCardPanelData.groovy

@@ -1,34 +1,12 @@
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.dySweetFishPlugin.tool.lang.DateUtil
 import com.dderp.common.api.BusinessExecutor
-import com.dderp.common.api.erp.ProductService
 import com.dderp.common.api.SupplierInitService
 import com.dderp.common.datas.ERPModule
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.datas.TokenUserFrom
-import com.dderp.common.entity.base.EChartDoubleData
 import com.dderp.common.entity.base.ProcessMapItem
-import com.dderp.common.entity.product.ProductInfo
+import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.sweetfish.service.RetResult
-import org.elasticsearch.action.search.SearchRequestBuilder
-import org.elasticsearch.action.search.SearchResponse
-import org.elasticsearch.index.query.QueryBuilders
-import org.elasticsearch.search.aggregations.AggregationBuilders
-import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval
-import org.elasticsearch.search.aggregations.bucket.histogram.ExtendedBounds
-import org.elasticsearch.search.aggregations.bucket.histogram.Histogram
-import org.elasticsearch.search.aggregations.bucket.histogram.InternalDateHistogram
-import org.elasticsearch.search.aggregations.bucket.terms.Terms
-import org.elasticsearch.search.aggregations.metrics.sum.InternalSum
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCount
 import org.rex.RMap
 
 import javax.annotation.Resource
-import java.math.RoundingMode
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.temporal.TemporalAdjusters
 
 /**
  * Created by jlutt on 2021-09-22
@@ -44,9 +22,6 @@ class BE_IndexCardPanelData implements BusinessExecutor<ProcessMapItem, ProcessM
     @Resource
     SupplierInitService supplierService
 
-    @Resource
-    ProductService productService
-
     @Override
     String scriptName() {
         return "首页面板查询业务数据"
@@ -61,434 +36,7 @@ class BE_IndexCardPanelData implements BusinessExecutor<ProcessMapItem, ProcessM
     RetResult<ProcessMapItem> execute(ProcessMapItem source) {
         RMap data = new RMap()
 
-        //region 生产数据查询
-
-        //查询待组版订单数量
-        SearchRequestBuilder childRequest1 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINT_ORDER_INDEX, 2021))
-                .setQuery(QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINT_ORDER_TYPE))
-                        .must(QueryBuilders.termQuery("voidFlag", 0)))
-        childRequest1 = childRequest1.addAggregation(
-                AggregationBuilders
-                        .filter("a3_count",
-                                OrderStatisticsQueryBuilder.valueOf("A3").apply(null, false, false)
-                        )
-                        .subAggregation(AggregationBuilders.count("subA3_Count").field("id"))
-        )
-        childRequest1 = childRequest1.addAggregation(
-                AggregationBuilders
-                        .filter("a7_count",
-                                OrderStatisticsQueryBuilder.valueOf("A7").apply(null, false, false)
-                        )
-                        .subAggregation(AggregationBuilders.count("subA7_Count").field("id"))
-        )
-        childRequest1 = childRequest1.addAggregation(
-                AggregationBuilders
-                        .filter("a12_count",
-                                OrderStatisticsQueryBuilder.valueOf("A12").apply(null, false, false)
-                        )
-                        .subAggregation(AggregationBuilders.count("subA12_Count").field("id"))
-        )
-        SearchResponse childRes1 = childRequest1.execute().actionGet()
-
-        InternalFilter genderWaitBreedOrderCount = childRes1.getAggregations().get("a3_count")
-        ValueCount valueWaitBreedOrderCount = genderWaitBreedOrderCount.getAggregations().get("subA3_Count")
-        data.put("waitBreedOrderCount", valueWaitBreedOrderCount.getValue())
-
-        InternalFilter genderWorkingOrderCount = childRes1.getAggregations().get("a7_count")
-        ValueCount valueWorkingOrderCount = genderWorkingOrderCount.getAggregations().get("subA7_Count")
-        data.put("workingOrderCount", valueWorkingOrderCount.getValue())
-
-        InternalFilter genderWaitSendOrderCount = childRes1.getAggregations().get("a12_count")
-        ValueCount valueWaitSendOrderCount = genderWaitSendOrderCount.getAggregations().get("subA12_Count")
-        data.put("waitSendOrderCount", valueWaitSendOrderCount.getValue())
-
-
-        //查询待下机版数量
-        SearchRequestBuilder childRequest11 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINTBILL_INDEX, 2021))
-                .setQuery(QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINTBILL_BREED_TYPE))
-                        .must(QueryBuilders.termQuery("voidFlag", 0)))
-
-        childRequest11 = childRequest11.addAggregation(
-                AggregationBuilders
-                        .filter("a3_count",
-                                BreedStatisticsQueryBuilder.valueOf("A3").apply(false)
-                        )
-                        .subAggregation(AggregationBuilders.count("subA3_Count").field("id"))
-        )
-
-        SearchResponse childRes11 = childRequest11.execute().actionGet()
-
-        InternalFilter genderScheduleBreedCount = childRes11.getAggregations().get("a3_count")
-        ValueCount valueScheduleBreedCount = genderScheduleBreedCount.getAggregations().get("subA3_Count")
-        data.put("scheduleBreedCount", valueScheduleBreedCount.getValue())
-
-        //endregion
-
-        if (source.getCurrentUser().getUserFrom() == TokenUserFrom.PC_ADMIN.value) {
-
-            LocalDate nowDate = LocalDate.now()
-            LocalDateTime nowTime = LocalDateTime.now()
-
-
-            //region 订单、施工单近7天的数量
-
-            RMap day7WorkData = new RMap()
-            RMap day7MoneyData = new RMap()
-
-            List<String> day7Work_legendStrArray = new ArrayList<>()
-            List<String> day7Money_legendStrArray = new ArrayList<>()
-            day7Work_legendStrArray.add("订单数量")
-            day7Work_legendStrArray.add("施工单版数量")
-            day7Money_legendStrArray.add("订单金额")
-            day7WorkData.put("legendStrArray", day7Work_legendStrArray)
-            day7MoneyData.put("legendStrArray", day7Money_legendStrArray)
-
-//            Date endDate2 = new Date();
-//            endDate2 = DateUtil.getStartOfDay(endDate2);
-//            Date beginDate2 = endDate2 - 6;
-            Date endDate2 = nowDate.toDate()
-            Date beginDate2 = (nowDate - 6).toDate()
-
-            List<String> day7Work_xAxisArray = (nowDate - 6..nowDate).collect {
-                String.valueOf(it.getMonthValue()) + "." + (it.dayOfMonth)
-            }.toList()
-
-//            List<String> day7Work_xAxisArray = (beginDate2..endDate2).collect {
-//                (it[Calendar.MONTH] + 1) + "." + (it[Calendar.DAY_OF_MONTH])
-//            }.toList();
-            day7WorkData.put("xAxisArray", day7Work_xAxisArray)
-            day7MoneyData.put("xAxisArray", day7Work_xAxisArray)
-
-            List<EChartDoubleData> day7Work_seriesList = new ArrayList<>()
-            List<EChartDoubleData> day7Money_seriesList = new ArrayList<>()
-
-            SearchRequestBuilder childRequest2 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINT_ORDER_INDEX, 2021))
-                    .setQuery(
-                            QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINT_ORDER_TYPE))
-                                    .must(QueryBuilders.termQuery("voidFlag", 0))
-                                    .must(QueryBuilders.rangeQuery("createTimeLong").gte(DateUtil.getStartOfDay(beginDate2).getTime()).lte(DateUtil.getEndOfDay(endDate2).getTime()))
-                    )
-
-
-            childRequest2.addAggregation(
-                    AggregationBuilders.dateHistogram("orders")
-                            .field("createTimeLong")
-                            .dateHistogramInterval(DateHistogramInterval.DAY)
-                            .minDocCount(0l)
-                            .extendedBounds(new ExtendedBounds(DateUtil.getStartOfDay(beginDate2).getTime(), DateUtil.getEndOfDay(endDate2).getTime()))
-                            .order(Histogram.Order.KEY_ASC)
-                            .subAggregation(
-                                    AggregationBuilders.sum("sub_orderMoney").field("orderMoneyTotal")
-                            )
-            )
-            SearchResponse childRes2 = childRequest2.execute().actionGet()
-            InternalDateHistogram day7Work_Orders = childRes2.getAggregations().get("orders")
-
-            EChartDoubleData day7Work_OrderCount_SeriesData = new EChartDoubleData()
-            day7Work_OrderCount_SeriesData.setName("订单数量")
-            day7Work_OrderCount_SeriesData.setType("line")
-
-            EChartDoubleData day7Work_OrderMoney_SeriesData = new EChartDoubleData()
-            day7Work_OrderMoney_SeriesData.setName("订单金额")
-            day7Work_OrderMoney_SeriesData.setType("line")
-
-            day7Work_Orders.buckets.each {
-                day7Work_OrderCount_SeriesData.getData().add(BigDecimal.valueOf(it.docCount))
-                InternalSum internalMoneySum = it.getAggregations().get("sub_orderMoney")
-                day7Work_OrderMoney_SeriesData.getData().add(BigDecimal.valueOf(internalMoneySum.getValue()))
-            }
-            //extendedBounds必须添加，防止开始和结束的数据为0，但加上后，好像前面会多一天
-            if (day7Work_OrderCount_SeriesData.getData().size() == 8) {
-                day7Work_OrderCount_SeriesData.getData().remove(0)
-            }
-            if (day7Work_OrderMoney_SeriesData.getData().size() == 8) {
-                day7Work_OrderMoney_SeriesData.getData().remove(0)
-            }
-
-            day7Work_seriesList.add(day7Work_OrderCount_SeriesData)
-            day7Money_seriesList.add(day7Work_OrderMoney_SeriesData)
-
-
-            //施工单
-            SearchRequestBuilder childRequest12 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINTBILL_INDEX, 2021))
-                    .setQuery(
-                            QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINTBILL_BREED_TYPE))
-                                    .must(QueryBuilders.termQuery("voidFlag", 0))
-                                    .must(QueryBuilders.rangeQuery("createTime").gte(DateUtil.getStartOfDay(beginDate2).getTime()).lte(DateUtil.getEndOfDay(endDate2).getTime()))
-                    )
-
-
-            childRequest12.addAggregation(
-                    AggregationBuilders.dateHistogram("breeds")
-                            .field("createTime")
-                            .dateHistogramInterval(DateHistogramInterval.DAY)
-                            .minDocCount(0l)
-                            .extendedBounds(new ExtendedBounds(DateUtil.getStartOfDay(beginDate2).getTime(), DateUtil.getEndOfDay(endDate2).getTime()))
-                            .order(Histogram.Order.KEY_ASC)
-            )
-            SearchResponse childRes12 = childRequest12.execute().actionGet()
-            InternalDateHistogram day7Work_Breeds = childRes12.getAggregations().get("breeds")
-
-            EChartDoubleData day7Work_BreedCount_SeriesData = new EChartDoubleData()
-            day7Work_BreedCount_SeriesData.setName("施工单版数量")
-            day7Work_BreedCount_SeriesData.setType("line")
-
-            day7Work_Breeds.buckets.each {
-                day7Work_BreedCount_SeriesData.getData().add(BigDecimal.valueOf(it.docCount))
-            }
-
-            //extendedBounds必须添加，防止开始和结束的数据为0，但加上后，好像前面会多一天
-            if (day7Work_BreedCount_SeriesData.getData().size() == 8) {
-                day7Work_BreedCount_SeriesData.getData().remove(0)
-            }
-
-            day7Work_seriesList.add(day7Work_BreedCount_SeriesData)
-
-            day7WorkData.put("seriesData", day7Work_seriesList)
-            day7MoneyData.put("seriesData", day7Money_seriesList)
-//        day7Work_Orders.
-
-            data.put("day7Work", day7WorkData)
-            data.put("day7Money", day7MoneyData)
-
-            //endregion
-
-            //region 订单产品近7天的印量
-
-
-            RMap day7ProductPrintCountData = new RMap()
-
-            List<String> day7ProductPrintCount_legendStrArray = new ArrayList<>()
-            List<ProductInfo> productInfoList = productService.getProductInfoAllLocal(source.getDataSourceId(), source.getSupplierCode())
-            productInfoList.each {
-                day7ProductPrintCount_legendStrArray.add(it.productName)
-            }
-            day7ProductPrintCount_legendStrArray.add("全部产品")
-            day7ProductPrintCountData.put("legendStrArray", day7ProductPrintCount_legendStrArray)
-
-//            Date endDate5 = new Date();
-//            endDate5 = DateUtil.getStartOfDay(endDate5);
-//            Date beginDate5 = endDate2 - 6;
-            Date endDate5 = nowDate.toDate()
-            Date beginDate5 = (nowDate - 6).toDate()
-
-            List<String> day7ProductPrintCount_xAxisArray = (nowDate - 6..nowDate).collect {
-                String.valueOf(it.getMonthValue()) + "." + String.valueOf(it.getDayOfMonth())
-            }.toList()
-
-//            List<String> day7ProductPrintCount_xAxisArray = (beginDate5..endDate5).collect {
-//                (it[Calendar.MONTH] + 1) + "." + (it[Calendar.DAY_OF_MONTH])
-//            }.toList();
-            day7ProductPrintCountData.put("xAxisArray", day7ProductPrintCount_xAxisArray)
-
-            List<EChartDoubleData> day7ProductPrintCount_seriesList = new ArrayList<>()
-
-            SearchRequestBuilder childRequest5 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINT_ORDER_INDEX, 2021))
-                    .setQuery(
-                            QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINT_ORDER_TYPE))
-                                    .must(QueryBuilders.termQuery("voidFlag", 0))
-                                    .must(QueryBuilders.rangeQuery("createTimeLong").gte(DateUtil.getStartOfDay(beginDate2).getTime()).lte(DateUtil.getEndOfDay(endDate2).getTime()))
-                    )
-
-
-            childRequest5.addAggregation(
-                    AggregationBuilders.dateHistogram("orders")
-                            .field("createTimeLong")
-                            .dateHistogramInterval(DateHistogramInterval.DAY)
-                            .minDocCount(0l)
-                            .extendedBounds(new ExtendedBounds(DateUtil.getStartOfDay(beginDate5).getTime(), DateUtil.getEndOfDay(endDate5).getTime()))
-                            .order(Histogram.Order.KEY_ASC)
-                            .subAggregation(
-                                    AggregationBuilders.terms("products")
-                                            .field("idProduct")
-                                            .size(100)
-                                            .order(Terms.Order.count(false))
-                                            .subAggregation(
-                                                    AggregationBuilders.sum("sub_orderPrintCount").field("orderQty")
-                                            )
-                            )
-                            .subAggregation(
-                                    AggregationBuilders.sum("sub_AllOrderPrintCount").field("orderQty")
-                            )
-            )
-            SearchResponse childRes5 = childRequest5.execute().actionGet()
-
-            productInfoList.each {
-                EChartDoubleData day7ProductPrintCount_SeriesData = new EChartDoubleData()
-                day7ProductPrintCount_SeriesData.setType("line")
-                day7ProductPrintCount_SeriesData.setName(it.productName)
-                day7ProductPrintCount_SeriesData.setId(it.getId())
-
-                day7ProductPrintCount_seriesList.add(day7ProductPrintCount_SeriesData)
-            }
-
-            EChartDoubleData day7ProductPrintCount_SeriesData = new EChartDoubleData()
-            day7ProductPrintCount_SeriesData.setType("line")
-            day7ProductPrintCount_SeriesData.setName("全部产品")
-            day7ProductPrintCount_SeriesData.setId(-1)
-            day7ProductPrintCount_seriesList.add(day7ProductPrintCount_SeriesData)
-
-
-            InternalDateHistogram day7ProductPrintCount_Orders = childRes5.getAggregations().get("orders")
-            List<Long> idProductList = new ArrayList<>()
-            day7ProductPrintCount_Orders.buckets.each {
-                idProductList.clear()
-                Terms productsGenders = it.getAggregations().get("products")
-                productsGenders.buckets.each { p ->
-                    Terms.Bucket productBucket = p
-                    long idProduct = Long.parseLong(productBucket.getKeyAsString())
-                    InternalSum internalOrderQtySum = productBucket.getAggregations().get("sub_orderPrintCount")
-
-                    idProductList.add(idProduct)
-
-                    EChartDoubleData chartData = day7ProductPrintCount_seriesList.find { x -> return x.getId() == idProduct }
-                    if (chartData != null) {
-                        chartData.getData().add(BigDecimal.valueOf(internalOrderQtySum.getValue()))
-                    }
-                }
-
-                InternalSum internalAllOrderQtySum = it.getAggregations().get("sub_AllOrderPrintCount")
-                EChartDoubleData chartAllData = day7ProductPrintCount_seriesList.find { x -> return x.getId() == -1 }
-                if (chartAllData != null) {
-                    chartAllData.getData().add(BigDecimal.valueOf(internalAllOrderQtySum.getValue()))
-                }
-
-                //找不到数据的得加0
-                List<EChartDoubleData> remainDataList = day7ProductPrintCount_seriesList.findAll { x -> return ((x.getId() != -1) && (!idProductList.any { y -> y == x.getId() })) }
-                remainDataList.each { d ->
-                    d.getData().add(BigDecimal.ZERO)
-                }
-            }
-
-            day7ProductPrintCount_seriesList.each {
-                //extendedBounds必须添加，防止开始和结束的数据为0，但加上后，好像前面会多一天
-                if (it.getData().size() == 8) {
-                    it.getData().remove(0)
-                }
-            }
-
-            day7ProductPrintCountData.put("seriesData", day7ProductPrintCount_seriesList)
-
-            data.put("day7ProductPrintCount", day7ProductPrintCountData)
-
-
-            //endregion
-
-            //region 订单月产品类型统计
-
-            RMap monthOrderProductData = new RMap()
-
-
-            LocalDateTime beginDate3 = nowTime.withDayOfMonth(1)
-            LocalDateTime endDate3 = nowTime.withDayOfMonth(nowTime.toLocalDate().lengthOfMonth())
-
-            List<RMap> monthOrderProduct_seriesList = new ArrayList<>()
-
-            SearchRequestBuilder childRequest3 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINT_ORDER_INDEX, 2021))
-                    .setQuery(
-                            QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINT_ORDER_TYPE))
-                                    .must(QueryBuilders.termQuery("voidFlag", 0))
-                                    .must(QueryBuilders.rangeQuery("createTimeLong").gte(DateUtil.getStartOfDay(DateUtil.localDateTimeToDate(beginDate3)).getTime()).lte(DateUtil.getEndOfDay(DateUtil.localDateTimeToDate(endDate3)).getTime()))
-                    )
-
-
-            childRequest3.addAggregation(
-                    AggregationBuilders.terms("orders")
-                            .field("idProduct")
-                            .size(100)
-                            .order(Terms.Order.count(false))
-                            .subAggregation(
-                                    AggregationBuilders.sum("sub_orderMoney").field("orderMoneyTotal")
-                            )
-            )
-            SearchResponse childRes3 = childRequest3.execute().actionGet()
-
-            Terms monthOrderProductGenders = childRes3.getAggregations().get("orders")
-            for (Terms.Bucket monthOrderProductBucket : monthOrderProductGenders.getBuckets()) {
-                long idProduct = Long.parseLong(monthOrderProductBucket.getKeyAsString())
-                RMap bucketData = new RMap()
-                InternalSum moneySum = monthOrderProductBucket.getAggregations().get("sub_orderMoney")
-                bucketData.put("name", productService.getProductInfoName(idProduct, source.getSupplierCode()))
-//                bucketData.put("value", monthOrderProductBucket.getDocCount());
-                bucketData.put("value", BigDecimal.valueOf(moneySum.getValue()).setScale(2, RoundingMode.HALF_UP))
-                monthOrderProduct_seriesList.add(bucketData)
-            }
-
-            monthOrderProductData.put("seriesData", monthOrderProduct_seriesList)
-            data.put("monthOrderProduct", monthOrderProductData)
-
-            //endregion
-
-            //region 订单月份数量统计
-
-            RMap month12WorkData = new RMap()
-            RMap month12MoneyData = new RMap()
-
-            LocalDateTime beginDate4 = nowTime.with(TemporalAdjusters.firstDayOfYear())
-            LocalDateTime endDate4 = nowTime.with(TemporalAdjusters.lastDayOfYear())
-
-            List<EChartDoubleData> month12Work_seriesList = new ArrayList<>()
-            List<EChartDoubleData> month12Money_seriesList = new ArrayList<>()
-
-            SearchRequestBuilder childRequest4 = esClient.getClient().prepareSearch(supplierService.getDateYearESIndex(source.getSupplierCode(), ESKeys.ES_ERP_PRINT_ORDER_INDEX, 2021))
-                    .setQuery(
-                            QueryBuilders.boolQuery().must(QueryBuilders.typeQuery(ESKeys.ES_ERP_PRINT_ORDER_TYPE))
-                                    .must(QueryBuilders.termQuery("voidFlag", 0))
-                                    .must(QueryBuilders.rangeQuery("createTimeLong").gte(DateUtil.getStartOfDay(DateUtil.localDateTimeToDate(beginDate4)).getTime()).lte(DateUtil.getEndOfDay(DateUtil.localDateTimeToDate(endDate4)).getTime()))
-                    )
-
-
-            childRequest4.addAggregation(
-                    AggregationBuilders.dateHistogram("orders")
-                            .field("createTimeLong")
-                            .dateHistogramInterval(DateHistogramInterval.MONTH)
-                            .minDocCount(0l)
-                            .extendedBounds(new ExtendedBounds(DateUtil.getStartOfDay(DateUtil.localDateTimeToDate(beginDate4)).getTime(), DateUtil.getEndOfDay(DateUtil.localDateTimeToDate(endDate4)).getTime()))
-                            .order(Histogram.Order.KEY_ASC)
-                            .subAggregation(
-                                    AggregationBuilders.sum("sub_orderMoney").field("orderMoneyTotal")
-                            )
-            )
-            SearchResponse childRes4 = childRequest4.execute().actionGet()
-            InternalDateHistogram month12Work_Orders = childRes4.getAggregations().get("orders")
-
-            EChartDoubleData month12Work_OrderCount_SeriesData = new EChartDoubleData()
-            month12Work_OrderCount_SeriesData.setName("订单数量")
-            month12Work_OrderCount_SeriesData.setType("bar")
-
-            EChartDoubleData month12Work_OrderMoney_SeriesData = new EChartDoubleData()
-            month12Work_OrderMoney_SeriesData.setName("订单金额")
-            month12Work_OrderMoney_SeriesData.setType("bar")
-
-            month12Work_Orders.buckets.each {
-                month12Work_OrderCount_SeriesData.getData().add(BigDecimal.valueOf(it.docCount))
-                InternalSum internalMoneySum = it.getAggregations().get("sub_orderMoney")
-                month12Work_OrderMoney_SeriesData.getData().add(BigDecimal.valueOf(internalMoneySum.getValue()).setScale(2, RoundingMode.HALF_UP))
-            }
-            //extendedBounds必须添加，防止开始和结束的数据为0，但加上后，好像前面会多一天
-            if (month12Work_OrderCount_SeriesData.getData().size() == 13) {
-                month12Work_OrderCount_SeriesData.getData().remove(0)
-            }
-            if (month12Work_OrderMoney_SeriesData.getData().size() == 13) {
-                month12Work_OrderMoney_SeriesData.getData().remove(0)
-            }
-
-
-            month12Work_seriesList.add(month12Work_OrderCount_SeriesData)
-            month12Money_seriesList.add(month12Work_OrderMoney_SeriesData)
-
-            month12WorkData.put("seriesData", month12Work_seriesList)
-            month12MoneyData.put("seriesData", month12Money_seriesList)
-//        day7Work_Orders.
-
-            data.put("month12Work", month12WorkData)
-            data.put("month12Money", month12MoneyData)
-
-            //endregion
-
-        }
-
-        data.put("showData", true)
+        data.put("showData", false)
 
         ProcessMapItem result = ProcessMapItem.newBuilder()
                 .itemData(data)

conf/script/1000/business/BE_System_TestListExt.groovy

@@ -1,51 +0,0 @@
-import com.dderp.common.api.BusinessExecutor
-import com.dderp.common.datas.ERPModule
-import com.dderp.common.entity.base.ProcessStringItem
-import com.sweetfish.service.RetResult
-import groovy.json.JsonSlurper
-import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.Logger
-
-import javax.annotation.Resource
-
-@SuppressWarnings("unused")
-class BE_System_TestListExt implements BusinessExecutor<ProcessStringItem, ProcessStringItem> {
-
-    protected final Logger logger = LogManager.getLogger(this.getClass().getSimpleName())
-
-    @Resource(name = "APP_HOME")
-    private String appHome
-
-    @Override
-    String scriptName() {
-        return "测试Groovy扩展方法是否成功"
-    }
-
-    @Override
-    ERPModule module() {
-        return ERPModule.SYSTEM
-    }
-
-    void start(long supplierCode) {
-        def jsonSlurper = new JsonSlurper()
-
-        def testTableJsonFile = new File(appHome + File.separator +
-                "conf" + File.separator +
-                "script" + File.separator +
-                "1000" + File.separator +
-                "quoteFiles" + File.separator +
-                "testTable.json")
-        def testTableJsonArray = jsonSlurper.parse(testTableJsonFile)
-
-        logger.info(testTableJsonArray.findQuotedElement(["规格": "正度", "开数": "16开"]))
-        logger.info(testTableJsonArray.findQuotedElements(["规格": "大度", "开数": "8开"]))
-    }
-
-    RetResult<ProcessStringItem> execute(ProcessStringItem source) {
-        return RetResult.<ProcessStringItem> successT().result(
-                ProcessStringItem.newBuilder()
-                        .itemValue("此代码无需执行，主要用于扩展Groovy方法，简化书写")
-                        .build()
-        )
-    }
-}

conf/script/1000/commons/BreedStatisticsQueryBuilder.groovy

@@ -1,299 +0,0 @@
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.datas.PrintBillLifeNode
-import org.apache.lucene.search.join.ScoreMode
-import org.elasticsearch.index.query.BoolQueryBuilder
-import org.elasticsearch.index.query.QueryBuilder
-import org.elasticsearch.index.query.QueryBuilders
-import org.elasticsearch.join.query.JoinQueryBuilders
-
-/**
- * Created by jlutt on 2021-05-08
- *
- * @author jlutt
- */
-
-enum BreedStatisticsQueryBuilder {
-    //待下达
-    A1{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.rangeQuery("lifeNodeId").gte(PrintBillLifeNode.submit.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-
-    //待纸张预出库
-    A2{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.submit.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperPreOut.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperStockOut.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-
-    //待下机
-    A3{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.submit.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.printFeedback.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-
-    //待纸张领料
-    A4{
-        QueryBuilder apply(boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperPreOut.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperPick.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-            return q
-        }
-    },
-
-    //待出库
-    A5{
-        QueryBuilder apply(boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperPick.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperStockOut.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-            return q
-        }
-    },
-
-    //待拼版反馈
-    A6{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.schedule.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.spliceBreedFeedback.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //待制版反馈
-    A7{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.schedule.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.makeBreedFeedback.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //待白料裁切反馈
-    A8{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.schedule.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.paperCutFeedback.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //待印刷反馈
-    A9{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.schedule.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.printFeedback.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //待外协下达
-    A10{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.outAssist.value))
-                                    .must(QueryBuilders.termQuery("lifeNodeState", 1)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.outAssist.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(1)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //待外协验收
-    A11{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.outAssist.value))
-                                    .must(QueryBuilders.termQuery("lifeNodeState", 2)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.outAssist.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(2)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-
-    //已外协验收
-    A12{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ESERPPRINTBILLLIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.outAssist.value))
-                                    .must(QueryBuilders.termQuery("lifeNodeState", 3)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ESERPPRINTBILLLIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.complete.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //待半成品反馈
-    A13{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ESERPPRINTBILLLIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.printFeedback.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ESERPPRINTBILLLIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.semiComplete.value))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0)),
-                            ScoreMode.None)
-                    )
-        }
-    },
-    //生产完成
-    A14{
-        QueryBuilder apply(boolean readCycle) {
-            return QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ESERPPRINTBILLLIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", PrintBillLifeNode.complete.value)),
-                            ScoreMode.None)
-                    )
-        }
-    };
-
-
-    abstract QueryBuilder apply(boolean readCycle);
-}

conf/script/1000/commons/GroovyExtensions.groovy

@@ -1,7 +1,3 @@
-import com.dderp.common.entity.order.OrderPart
-import com.dderp.common.entity.order.OrderPartParamValue
-import com.dderp.common.entity.product.PartParameter
-import com.dderp.common.entity.product.ProductInfo
 import org.apache.commons.lang3.StringUtils
 
 class GroovyExtensions {
@@ -20,43 +16,5 @@ class GroovyExtensions {
                 }
             }
         }
-
-        //下面的代码参考官网的元编程
-        OrderPart.metaClass {
-            quoteProduct = { ProductInfo product ->
-                delegate.metaClass.@"$product" = product
-                return delegate
-            }
-
-            quoteParameter = {String paramName ->
-                def orderPart = delegate as OrderPart
-
-                def productInfo = delegate.product as ProductInfo
-                def partInfo = productInfo.findPartInfo(orderPart.idPart)
-
-                PartParameter partParameter = partInfo.parameterList.find {(it.productParameter != null) && (StringUtils.equalsIgnoreCase(it.productParameter.parameterName, paramName)) }
-                if (partParameter == null) {
-                    return null
-                }
-
-                OrderPartParamValue orderPartParamValue = orderPart.paramValueList.find {it.idParameter == partParameter.idParameter}
-                if (orderPartParamValue == null) {
-                    return null
-                }
-
-                return orderPartParamValue
-            }
-
-            quoteParameterValue = {String paramName ->
-                def orderPart = delegate as OrderPart
-
-                OrderPartParamValue orderPartParamValue = orderPart.quoteParameter paramName
-                if (orderPartParamValue == null) {
-                    return null
-                }
-
-                return orderPartParamValue.paramValue
-            }
-        }
     }
 }

conf/script/1000/commons/OrderStatisticsQueryBuilder.groovy

@@ -1,455 +0,0 @@
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.datas.OrderLifeCycleNode
-import com.dySweetFishPlugin.tool.lang.DateUtil
-import org.apache.lucene.search.join.ScoreMode
-import org.elasticsearch.index.query.BoolQueryBuilder
-import org.elasticsearch.index.query.InnerHitBuilder
-import org.elasticsearch.index.query.QueryBuilder
-import org.elasticsearch.index.query.QueryBuilders
-import org.elasticsearch.join.query.JoinQueryBuilders
-
-import java.time.Instant
-import java.time.LocalDate
-import java.time.ZoneId
-
-/**
- * Created by jlutt on 2021-05-08
- *
- * @author jlutt
- */
-
-enum OrderStatisticsQueryBuilder {
-
-    //待审核
-    A1{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.CREATE.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.rangeQuery("lifeNodeId").gt(OrderLifeCycleNode.CREATE.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    //文件待处理
-    A2{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.VERIFY.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.IMAGE_DESIGN.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    //待组版
-    A3{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.VERIFY.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.COMPOSE_PLATE.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    //待排产
-    A4{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.TRANSMITTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-//                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.COMPOSE_PLATE.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.PLANNED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-
-            if (readCycle) {
-                q = q.must(JoinQueryBuilders.hasChildQuery(
-                        ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                        QueryBuilders.boolQuery()
-                                .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.COMPOSE_PLATE.getValue()))
-                                .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                        ScoreMode.None).innerHit(new InnerHitBuilder().setSize(10000)))
-            }
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    //待拼版
-    A5{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.TRANSMITTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.PDF_PLATED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A6{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.TRANSMITTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.PS_MAKE.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A7{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.TRANSMITTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.STOCK_IN.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A8{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.TRANSMITTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.PRINTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A9{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.TRANSMITTED.getValue()))
-                                    .must(QueryBuilders.rangeQuery("lifeNodeState").gt(0))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.PREPARED.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A10{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.OUT_ASSIST_WAIT.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.OUT_ASSIST_COMPLETED.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A11{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.VERIFY.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.STOCK_IN.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A12{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.STOCK_IN.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.SEND.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A13{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            long lastStartTime = DateUtil.getStartOfDay(Date.from(LocalDate.now().plusDays(-1).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant())).getTime()
-            long lastEndTime = DateUtil.getEndOfDay(Date.from(LocalDate.now().plusDays(-1).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant())).getTime()
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-            if (readCycle) {
-                q = q.must(QueryBuilders.rangeQuery("createTimeLong").gte(lastStartTime).lte(lastEndTime))
-                        .should(JoinQueryBuilders.hasChildQuery(
-                                ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                                QueryBuilders.boolQuery()
-                                        .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.COMPOSE_PLATE.getValue()))
-                                        .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                                ScoreMode.None).innerHit(new InnerHitBuilder().setSize(10000)))
-            } else {
-                q = q.must(QueryBuilders.rangeQuery("createTimeLong").gte(lastStartTime).lte(lastEndTime))
-            }
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A14{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            long curStartTime = DateUtil.getStartOfDay(Date.from(Instant.now())).getTime()
-            long curEndTime = DateUtil.getEndOfDay(Date.from(Instant.now())).getTime()
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-            if (readCycle) {
-                q = q.must(QueryBuilders.rangeQuery("createTimeLong").gte(curStartTime).lte(curEndTime))
-                        .should(JoinQueryBuilders.hasChildQuery(
-                                ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                                QueryBuilders.boolQuery()
-                                        .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.COMPOSE_PLATE.getValue()))
-                                        .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                                ScoreMode.None).innerHit(new InnerHitBuilder().setSize(10000)))
-            } else {
-                q = q.must(QueryBuilders.rangeQuery("createTimeLong").gte(curStartTime).lte(curEndTime))
-            }
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    },
-
-    A15{
-        QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle) {
-            BoolQueryBuilder q = QueryBuilders.boolQuery()
-                    .must(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.CREATE.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-                    .mustNot(JoinQueryBuilders.hasChildQuery(
-                            ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                            QueryBuilders.boolQuery()
-                                    .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.SEND.getValue()))
-                                    .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                            ScoreMode.None)
-                    )
-
-            if (readCycle) {
-                q = q.should(JoinQueryBuilders.hasChildQuery(
-                        ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE,
-                        QueryBuilders.boolQuery()
-                                .must(QueryBuilders.termQuery("lifeNodeId", OrderLifeCycleNode.COMPOSE_PLATE.getValue()))
-                                .must(QueryBuilders.termQuery("voidMasterFlag", 0)),
-                        ScoreMode.None).innerHit(new InnerHitBuilder().setSize(10000)))
-            }
-            if (checkPermission) {
-                if ((permissionIds != null) && (!permissionIds.isEmpty())) {
-                    q = q.must(QueryBuilders.termsQuery("createBy", permissionIds.toArray()))
-                }
-            }
-            return q
-        }
-    };
-
-
-    abstract QueryBuilder apply(List<Long> permissionIds, boolean checkPermission, boolean readCycle);
-}

conf/script/1000/init/Init_14_Client.groovy

@@ -1,109 +0,0 @@
-import com.dderp.business.dao.ClientDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.RedisKeys
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.entity.client.ClientIndustryInfo
-import com.dderp.common.entity.client.ClientInfo
-import com.dderp.common.entity.client.ClientLevel
-import com.dderp.common.entity.client.ClientReceiveAddress
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.dySweetFishPlugin.redis.RedisService
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-static def createRunnable(ESClient esClient, ClientDao clientDao, boolean resetClientInfo,
-                          NoSqlKeysService keysService, JsonConvert jsonConvert, Logger logger,
-                          RedisService redisService, String dataSourceId, long supplierCode) {
-    return {
-        RMap params = new RMap()
-
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_ERP_CLIENT_INDUSTRY_INFO, supplierCode));
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<ClientIndustryInfo> industryInfoList = clientDao.queryClientIndustry(params, p, dataSourceId, supplierCode);
-
-            if (!industryInfoList.isEmpty()) {
-                Map<String, String> industryMap = industryInfoList.collectEntries { [String.valueOf(it.getId()), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_ERP_CLIENT_INDUSTRY_INFO, supplierCode), industryMap);
-            }
-        });
-
-
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_ERP_CLIENT_LEVEL, supplierCode));
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<ClientLevel> levelList = clientDao.queryClientLevel(params, p, dataSourceId, supplierCode);
-
-            if (!levelList.isEmpty()) {
-                Map<String, String> levelMap = levelList.collectEntries { [String.valueOf(it.getId()), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_ERP_CLIENT_LEVEL, supplierCode), levelMap);
-            }
-        });
-
-        if (resetClientInfo) {
-            esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_CLIENT_INFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                    Utility.ofMap(ESKeys.ES_ERP_CLIENT_INFO_TYPE, "clientinfo.json"));
-
-            Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-                List<ClientInfo> clientInfoList = clientDao.queryClientInfo(params, p, dataSourceId, supplierCode);
-
-                if (!clientInfoList.isEmpty()) {
-                    BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk();
-                    clientInfoList.forEach((x) -> {
-                        IndexRequestBuilder indexRequest = esClient.getClient()
-                                .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_CLIENT_INFO_INDEX, supplierCode), ESKeys.ES_ERP_CLIENT_INFO_TYPE)
-                                .setId(String.valueOf(x.getId()))
-                                .setSource(jsonConvert.convertTo(x), XContentType.JSON);
-                        bulkRequest.add(indexRequest);
-                    });
-                    BulkResponse bulkResponse = bulkRequest.execute().actionGet();
-
-                    if (bulkResponse.hasFailures()) {
-                        logger.error("索引客户档案：" + bulkResponse.buildFailureMessage());
-                    } else {
-                        logger.info("索引客户档案共" + clientInfoList.size() + "条记录");
-                    }
-                }
-            });
-        } else {
-            esClient.checkIndexEx(keysService.getESKey(ESKeys.ES_ERP_CLIENT_INFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                    Utility.ofMap(ESKeys.ES_ERP_CLIENT_INFO_TYPE, "clientinfo.json"));
-        }
-
-
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_CLIENT_RECEIVEADDRESS_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_CLIENT_RECEIVEADDRESS_TYPE, "clientreceiveaddress.json"));
-
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<ClientReceiveAddress> addressList = clientDao.queryClientReceiveAddress(params, p, dataSourceId, supplierCode);
-
-            if (!addressList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk();
-                addressList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_CLIENT_RECEIVEADDRESS_INDEX, supplierCode), ESKeys.ES_ERP_CLIENT_RECEIVEADDRESS_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON);
-                    bulkRequest.add(indexRequest);
-                });
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet();
-
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引客户收货地址：" + bulkResponse.buildFailureMessage());
-                } else {
-                    logger.info("索引客户收货地址共" + addressList.size() + "条记录");
-                }
-            }
-        });
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, clientDao, resetClientInfo,
-        keysService, jsonConvert, logger,
-        redisService, dataSourceId, supplierCode)

conf/script/1000/init/Init_17_ProductInfo.groovy

@@ -1,124 +0,0 @@
-import Ignore_ExecPageFlipper as ExecPageFlipper
-import com.dderp.business.dao.ProductDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.RedisKeys
-import com.dderp.common.entity.product.*
-import com.dySweetFishPlugin.redis.RedisService
-import com.dySweetFishPlugin.sql.TableCodeNode
-import com.dySweetFishPlugin.sql.TableIdService
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import org.apache.commons.lang3.StringUtils
-import org.rex.RMap
-
-import java.util.concurrent.CopyOnWriteArrayList
-
-static ProductInfo getProductLocalInfo(long idProduct, ProductDao productDao, String dataSourceId, long supplierCode) {
-    //获取主表信息
-    RMap paramMap = new RMap()
-    paramMap.put("id", idProduct)
-
-    ProductInfo productMaster = productDao.selectProductInfo(paramMap, dataSourceId, supplierCode)
-
-    //获取部件表信息
-    RMap paramProductMap = new RMap()
-    paramProductMap.put("idproduct", idProduct)
-
-    List<PartInfo> partSlave = productDao.selectPartInfo(paramProductMap, dataSourceId, supplierCode)
-
-    partSlave.each { part ->
-        //获取部件一级参数信息
-        RMap paramPartMap = new RMap()
-        paramPartMap.put("idpartinfo", part.id)
-
-        List<PartParameter> partParameterList = productDao.selectPartParameter(paramPartMap, dataSourceId, supplierCode)
-
-        partParameterList.each { partParameter ->
-            //获取部件二级参数
-            RMap paramItemMap = new RMap()
-            paramItemMap.put("idPartInfo", part.id)
-            paramItemMap.put("idParameter", partParameter.idParameter)
-            List<PartParameterItem> partParameterItemList = productDao.selectPartParameterItem(paramItemMap, dataSourceId, supplierCode)
-            partParameter.itemList = partParameterItemList
-        }
-
-        part.parameterList = partParameterList
-
-        //获取部件工艺信息
-        List<PartWorkProcess> partWorkProcessList = productDao.selectPartWorkProcess(paramPartMap, dataSourceId, supplierCode)
-        part.workProcessList = partWorkProcessList
-    }
-
-    productMaster.partInfoList = partSlave
-
-    return productMaster
-}
-
-static def createRunnable(RedisService redisService, NoSqlKeysService keysService, TableIdService tableIdService, ProductDao productDao, JsonConvert jsonConvert, String dataSourceId, long supplierCode) {
-    return {
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_INFO, supplierCode))
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_DETAIL, supplierCode))
-
-        RMap params = new RMap()
-        ExecPageFlipper.execute(300, { PageFlipper p ->
-            params.put("voidFlag", -1)
-            List<ProductInfo> productInfoList = productDao.selectProductInfoList(params, dataSourceId, supplierCode, p)
-
-            if (!productInfoList.isEmpty()) {
-                Map<String, String> productInfoHashMap = productInfoList.collectEntries { [String.valueOf(it.id), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_INFO, supplierCode), productInfoHashMap)
-            }
-
-            //产品详情 下面为了速度，使用并行流，所以这里使用同步的list
-            List<ProductInfo> productDetailList = new CopyOnWriteArrayList<>()
-            productInfoList.each { x ->
-                ProductInfo productDetail = getProductLocalInfo(x.id, productDao, dataSourceId, supplierCode)
-                productDetailList.add(productDetail)
-
-                if (StringUtils.isNotBlank(x.getBillPrefix())) {
-                    if (!x.getBillPrefix().trim().equalsIgnoreCase("PB"))
-                        tableIdService.addTableCodeNode(TableCodeNode.newBuilder()
-                                .codeName("epPrintBill.BillCode." + x.billPrefix.trim())
-                                .tableName("v_epprintbillcode")
-                                .codeFieldName("billCode")
-                                .codePrefix(x.billPrefix)
-                                .codeYear(true)
-                                .yearLength(2)
-                                .codeMonth(true)
-                                .codeDay(x.billCodeTimeKind == 1)
-                                .codeLength((x.billCodeTimeKind == 1) ? 4 : 5)
-                                .build(),
-                                true,
-                                dataSourceId,
-                                String.valueOf(supplierCode))
-                }
-
-                if (StringUtils.isNotBlank(x.getOrderPrefix())) {
-                    if (!x.getOrderPrefix().trim().equalsIgnoreCase("OB"))
-                        tableIdService.addTableCodeNode(TableCodeNode.newBuilder()
-                                .codeName("eoPrintOrder.OrderCode." + x.orderPrefix.trim())
-                                .tableName("v_eoPrintOrderCode")
-                                .codeFieldName("orderCode")
-                                .codePrefix(x.orderPrefix)
-                                .codeYear(true)
-                                .yearLength(2)
-                                .codeMonth(true)
-                                .codeDay(true)
-                                .codeLength(4)
-                                .build(),
-                                true,
-                                dataSourceId,
-                                String.valueOf(supplierCode))
-                }
-            }
-
-            if (!productDetailList.isEmpty()) {
-                Map<String, String> productHashMap = productDetailList.collectEntries { [String.valueOf(it.id), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_DETAIL, supplierCode), productHashMap)
-            }
-        })
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(redisService, keysService, tableIdService, productDao, jsonConvert, dataSourceId, supplierCode)

conf/script/1000/init/Init_18_ES_ProductInfo.groovy

@@ -1,54 +0,0 @@
-import Ignore_ExecPageFlipper as ExecPageFlipper
-import com.dderp.business.dao.ProductDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.entity.product.ProductInfo
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, ProductDao productDao, JsonConvert jsonConvert, Logger logger, String dataSourceId, long supplierCode) {
-    return {
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PRODUCT_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PRODUCT_TYPE, "product.json"))
-
-        RMap params = new RMap()
-        ExecPageFlipper.execute(300, { PageFlipper p ->
-            List<ProductInfo> productInfoList = productDao.selectProductInfoList(params, dataSourceId, supplierCode, p)
-
-            if (!productInfoList.isEmpty()) {
-                //产品基本信息，存入es
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                productInfoList.each { x ->
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_PRODUCT_INDEX, supplierCode), ESKeys.ES_ERP_PRODUCT_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                }
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引产品档案出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引产品档案,共" + productInfoList.size() + "条记录")
-                }
-            }
-        })
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, productDao, jsonConvert, logger, dataSourceId, supplierCode)
-
-
-
-
-

conf/script/1000/init/Init_19_ProductType.groovy

@@ -1,29 +0,0 @@
-import Ignore_ExecPageFlipper as ExecPageFlipper
-import com.dderp.business.dao.ProductDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.RedisKeys
-import com.dderp.common.entity.product.ProductType
-import com.dySweetFishPlugin.redis.RedisService
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import org.rex.RMap
-
-static def createRunnable(RedisService redisService, NoSqlKeysService keysService, ProductDao productDao, JsonConvert jsonConvert, String dataSourceId, long supplierCode) {
-    return {
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_TYPE, supplierCode))
-
-        RMap params = new RMap()
-        ExecPageFlipper.execute(300, { PageFlipper p ->
-            params.put("voidFlag", -1)
-            List<ProductType> productTypeList = productDao.selectProductType(params, p, dataSourceId, supplierCode)
-
-            if (!productTypeList.isEmpty()) {
-                Map<String, String> productTypeHashMap = productTypeList.collectEntries { [String.valueOf(it.id), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_TYPE, supplierCode), productTypeHashMap)
-            }
-        })
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(redisService, keysService, productDao, jsonConvert, dataSourceId, supplierCode)

conf/script/1000/init/Init_20_ProductImage.groovy

@@ -1,55 +0,0 @@
-import Ignore_ExecPageFlipper as ExecPageFlipper
-import com.dderp.business.dao.ProductDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.entity.product.ProductImage
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, ProductDao productDao, JsonConvert jsonConvert, Logger logger, String dataSourceId, long supplierCode) {
-    return {
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PRODUCT_IMAGE_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PRODUCT_IMAGE_TYPE, "productImage.json"))
-
-        RMap params = new RMap()
-        ExecPageFlipper.execute(300, { PageFlipper p ->
-            List<ProductImage> productImageList = productDao.selectProductImageList(params, dataSourceId, supplierCode, p)
-
-            if (!productImageList.isEmpty()) {
-                //产品基本信息，存入es
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                productImageList.each { x ->
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_PRODUCT_IMAGE_INDEX, supplierCode), ESKeys.ES_ERP_PRODUCT_IMAGE_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                }
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引产品图片出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引产品图片,共" + productImageList.size() + "条记录")
-                }
-            }
-        })
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, productDao, jsonConvert, logger, dataSourceId, supplierCode)
-
-
-
-
-
-

conf/script/1000/init/Init_21_ProductParameter.groovy

@@ -1,76 +0,0 @@
-import Ignore_ExecPageFlipper as ExecPageFlipper
-import com.dderp.business.dao.ProductDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.RedisKeys
-import com.dderp.common.entity.product.ProductParameter
-import com.dderp.common.tool.ERPUtils
-import com.dySweetFishPlugin.redis.RedisService
-import com.dySweetFishPlugin.sql.TableCodeNode
-import com.dySweetFishPlugin.sql.TableIdNode
-import com.dySweetFishPlugin.sql.TableIdService
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import org.apache.commons.lang3.StringUtils
-import org.rex.RMap
-
-static def createRunnable(TableIdService tableIdService, RedisService redisService, NoSqlKeysService keysService, ProductDao productDao, JsonConvert jsonConvert, String sysRunMode, String dataSourceId, long supplierCode) {
-    return {
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_PARAMETER, supplierCode))
-
-        RMap params = new RMap()
-        ExecPageFlipper.execute(300, { PageFlipper p ->
-            List<ProductParameter> productParameterList = productDao.selectProductParameter(params, p, dataSourceId, supplierCode)
-
-            if (!productParameterList.isEmpty()) {
-                Map<String, String> productParameterHashMap = productParameterList.collectEntries { [String.valueOf(it.id), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_PARAMETER, supplierCode), productParameterHashMap)
-            }
-        })
-
-        String json = redisService.hget(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_PARAMETER, supplierCode), String.valueOf(ERPUtils.RESERVE_PRODUCT_PARAMETER_ID))
-        ProductParameter reserveParameter = (StringUtils.isBlank(json)) ? null : jsonConvert.convertFromO(ProductParameter.class, json) as ProductParameter
-        if ("ProductCenter".equalsIgnoreCase(sysRunMode)) {
-            //产品中心模式，查看有没有 保留的产品参数，有则需要删除
-            if (reserveParameter != null) {
-                productDao.deleteProductParameter(reserveParameter, dataSourceId, supplierCode)
-                redisService.hdel(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_PARAMETER, supplierCode), String.valueOf(ERPUtils.RESERVE_PRODUCT_PARAMETER_ID))
-                //还需要刷新下tableId
-                tableIdService.addTableIdNode(TableIdNode.newBuilder()
-                        .idName("tbProductParameter.id")
-                        .tableName("tbProductParameter")
-                        .idFieldName("id")
-                        .build(),
-                        dataSourceId,
-                        String.valueOf(supplierCode))
-            }
-        } else {
-            //如果是其它模式，则增加一条记录
-            if (reserveParameter == null) {
-                reserveParameter = new ProductParameter()
-                reserveParameter.id = ERPUtils.RESERVE_PRODUCT_PARAMETER_ID
-                reserveParameter.parameterName = "系统分界线参数"
-                reserveParameter.parameterFieldPart = ""
-                reserveParameter.parameterFieldOrder = ""
-                reserveParameter.fieldType = 1
-                reserveParameter.selectKind = 0
-                reserveParameter.idDictType = 0L
-                reserveParameter.voidFlag = 1
-                ProductParameter.create(reserveParameter, 0L)
-                productDao.addProductParameterSync(reserveParameter, dataSourceId, supplierCode)
-                redisService.hset(keysService.getRedisKey(RedisKeys.KEY_PRODUCT_PARAMETER, supplierCode), String.valueOf(reserveParameter.id), jsonConvert.convertTo(reserveParameter))
-                //还需要刷新下tableId
-                tableIdService.addTableIdNode(TableIdNode.newBuilder()
-                        .idName("tbProductParameter.id")
-                        .tableName("tbProductParameter")
-                        .idFieldName("id")
-                        .build(),
-                        dataSourceId,
-                        String.valueOf(supplierCode))
-            }
-        }
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(tableIdService, redisService, keysService, productDao, jsonConvert, sysRunMode, dataSourceId, supplierCode)
-

conf/script/1000/init/Init_22_PrintOrder.groovy

@@ -1,42 +0,0 @@
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.util.Utility
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, long supplierCode) {
-    return {
-        //结转方式，es中只存储当期数据，历史完成数据均在数据库中查询
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PRINT_ORDER_INDEX, supplierCode) + "_current", ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PRINT_ORDER_TYPE, "printOrder.json",
-                        ESKeys.ES_ERP_WORK_PART_TYPE, "workPart.json",
-                        ESKeys.ES_ERP_ORDER_PREPAY_TYPE, "orderPrePay.json",
-                        ESKeys.ES_ERP_DELIVERY_FEED_BACK_INFO_TYPE, "deliveryFeedBackInfo.json",  // 发货反馈记录
-                        ESKeys.ES_ERP_ORDER_DELIVER_INFORM_TYPE, "orderDeliverInform.json",  //发货通知
-                        ESKeys.ES_ERP_ORDER_LIFECYCLE_TYPE, "orderLifeCycle.json", //订单生命周期
-                        ESKeys.ES_ERP_ORDER_LIFECYCLE_COUNT_TYPE, "orderLifeCycleCount.json", //订单生命周期数量
-                        ESKeys.ES_ERP_ORDER_SEND_ADDRESS_TYPE, "orderSendAddress.json", //订单发货地址
-                        ESKeys.ES_ERP_ORDER_DISPATCH_ITEM_TYPE, "orderImageDispatchItem.json", //订单修图
-                        ESKeys.ES_ERP_ORDER_RECEIVABLE_TYPE, "orderReceivable.json", //订单应收
-                        ESKeys.ES_ERP_ORDER_CHARGE_DATA_TYPE, "orderChargeData.json", //订单收款
-                        ESKeys.ES_ERP_ORDER_STOCK_ITEM_TYPE, "orderStockItem.json",
-                        ESKeys.ES_ERP_ORDER_STOCK_LABEL_TYPE, "orderStockLabel.json",
-                        ESKeys.ES_ERP_ORDER_PART_TYPE, "orderPart.json",
-                        ESKeys.ES_ERP_ORDER_PART_PARAMS_TYPE, "orderPartParamValue.json",
-                        ESKeys.ES_ERP_ORDER_PART_PROCESS_TYPE, "orderPartProcess.json",
-                        ESKeys.ES_ERP_ORDER_MATERIAL_TYPE, "orderMaterialItem.json",
-                        ESKeys.ES_ERP_ORDER_COST_ITEM_TYPE, "orderCostItem.json"
-                ))
-
-        esClient.checkIndexEx(keysService.getESKey(ESKeys.ES_ERP_ORDER_STEP_INDEX, supplierCode) + "_current", ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_ORDER_STEP_TYPE, "orderStep.json"))
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, supplierCode)
-
-
-
-
-
-

conf/script/1000/init/Init_23_PrintBill.groovy

@@ -1,28 +0,0 @@
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.util.Utility
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, long supplierCode) {
-    return {
-        esClient.checkIndexEx(keysService.getESKey(ESKeys.ES_ERP_PRINTBILL_INDEX, supplierCode) + "_current", ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PRINTBILL_TYPE, "printBill.json",
-                        ESKeys.ES_ERP_PRINTBILL_BREED_TYPE, "printBillBreed.json",
-                        ESKeys.ES_ERP_PRINTBILL_LIFECYCLE_TYPE, "printBillLifeCycle.json",
-                        ESKeys.ES_ERP_PRINT_BREED_PART_TYPE, "printBreedPart.json",
-                        ESKeys.ES_ERP_MACHINE_BREED_TASK_TYPE, "machineBreedTask.json"))
-
-        esClient.checkIndexEx(keysService.getESKey(ESKeys.ES_ERP_PRINTBILL_STEP_INDEX, supplierCode) + "_current", ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PRINTBILL_STEP_TYPE, "printBillStep.json"))
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, supplierCode)
-
-
-
-
-
-
-

conf/script/1000/init/Init_24_OutAssistInfo.groovy

@@ -1,67 +0,0 @@
-import com.dderp.business.dao.OutAssistDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.entity.outassist.OutAssistInfo
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-import java.time.Instant
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, OutAssistDao outAssistDao,
-                          JsonConvert jsonConvert, Logger logger,
-                          String dataSourceId, long supplierCode) {
-    RMap params = new RMap();
-
-    return {
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_OUTASSIST_INFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_OUTASSIST_INFO_TYPE, "outassistinfo.json"));
-
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<OutAssistInfo> outAssistInfoList = outAssistDao.queryOutAssistInfo(params, p, dataSourceId, supplierCode);
-
-            if (!outAssistInfoList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk();
-                outAssistInfoList.forEach((x) -> {
-                    if (x.getCreateTime() != null) {
-                        x.setCreateTimeLong(x.getCreateTime().getTime());
-                    } else {
-                        x.setCreateTimeLong(Date.from(Instant.now()).getTime());
-                    }
-                    if (x.getUpdateTime() != null) {
-                        x.setUpdateTimeLong(x.getUpdateTime().getTime());
-                    } else {
-                        x.setUpdateTimeLong(Date.from(Instant.now()).getTime());
-                    }
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_OUTASSIST_INFO_INDEX, supplierCode), ESKeys.ES_ERP_OUTASSIST_INFO_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON);
-                    bulkRequest.add(indexRequest);
-                });
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet();
-
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引外协档案：" + bulkResponse.buildFailureMessage());
-                } else {
-                    logger.info("索引外协档案共" + outAssistInfoList.size() + "条记录");
-                }
-            }
-        });
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, outAssistDao, jsonConvert, logger, dataSourceId, supplierCode)
-
-
-
-
-

conf/script/1000/init/Init_25_SupplierInfo.groovy

@@ -1,55 +0,0 @@
-import com.dderp.business.dao.SupplierDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.entity.supply.SupplierInfo
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, SupplierDao supplierDao,
-                          JsonConvert jsonConvert, Logger logger,
-                          String dataSourceId, long supplierCode) {
-    RMap params = new RMap();
-
-    return {
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_SUPPLIER_INFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_SUPPLIER_INFO_TYPE, "supplierinfo.json"));
-
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<SupplierInfo> supplierInfoList = supplierDao.querySupplierInfo(params, p, dataSourceId, supplierCode);
-
-            if (!supplierInfoList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk();
-                supplierInfoList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_SUPPLIER_INFO_INDEX, supplierCode), ESKeys.ES_ERP_SUPPLIER_INFO_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON);
-                    bulkRequest.add(indexRequest);
-                });
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet();
-
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引供应商档案：" + bulkResponse.buildFailureMessage());
-                } else {
-                    logger.info("索引供应商档案共" + supplierInfoList.size() + "条记录");
-                }
-            }
-        });
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, supplierDao, jsonConvert, logger, dataSourceId, supplierCode)
-
-
-
-
-

conf/script/1000/init/Init_26_WorkProcess.groovy

@@ -1,50 +0,0 @@
-import Ignore_ExecPageFlipper as ExecPageFlipper
-import com.dderp.business.dao.ProductDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.entity.product.WorkProcess
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, ProductDao productDao, JsonConvert jsonConvert, Logger logger, String dataSourceId, long supplierCode) {
-    return {
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_WORK_PROCESS_INDEX, supplierCode),
-                ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_WORK_PROCESS_TYPE, "workprocess.json"))
-
-        RMap params = new RMap()
-
-        ExecPageFlipper.execute(300, { PageFlipper p ->
-            List<WorkProcess> workProcessList = productDao.selectWorkProcess(params, p, dataSourceId, supplierCode)
-
-            if (!workProcessList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                workProcessList.each { x ->
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_WORK_PROCESS_INDEX, supplierCode), ESKeys.ES_ERP_WORK_PROCESS_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                }
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引工艺档案出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引工艺档案,共" + workProcessList.size() + "条记录")
-                }
-            }
-        })
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, productDao, jsonConvert, logger, dataSourceId, supplierCode)

conf/script/1000/init/Init_27_Material.Groovy

@@ -1,94 +0,0 @@
-import com.dderp.common.entity.material.MaterialInfo
-import com.dderp.common.entity.material.MaterialInfoType
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.dySweetFishPlugin.sql.TableCodeNode
-import com.dySweetFishPlugin.sql.TableIdService
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.commons.lang3.StringUtils
-import org.apache.logging.log4j.Logger
-import com.dderp.business.dao.MaterialDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, MaterialDao materialDao, TableIdService tableIdService,
-                          JsonConvert jsonConvert, Logger logger, String dataSourceId, long supplierCode) {
-    return {
-        RMap params = new RMap()
-        //辅料类型档案
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_MATERIALTYPE_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_MATERIALTYPE_TYPE, "materialtype.json"))
-
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<MaterialInfoType> materialInfoTypeList = materialDao.selectMaterialType(params, p, dataSourceId, supplierCode)
-            if (!materialInfoTypeList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                materialInfoTypeList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_MATERIALTYPE_INDEX, supplierCode), ESKeys.ES_ERP_MATERIALTYPE_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-
-                    if (StringUtils.isNotBlank(x.getMaterialTypeCode())) {
-                        tableIdService.addTableCodeNode(TableCodeNode.newBuilder()
-                                .codeName("tbMaterialInfo.code." + x.getMaterialTypeCode().trim())
-                                .tableName("tbMaterialInfo")
-                                .codeFieldName("materialCode")
-                                .codePrefix(x.getMaterialTypeCode())
-                                .codeYear(false)
-                                .yearLength(4)
-                                .codeMonth(false)
-                                .codeDay(false)
-                                .codeLength(5)
-                                .build(),
-                                true,
-                                dataSourceId,
-                                String.valueOf(supplierCode))
-                    }
-                })
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引辅料分类出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引辅料分类,共" + materialInfoTypeList.size() + "条记录")
-                }
-            }
-        })
-
-        //辅料档案
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_MATERIALINFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_MATERIALINFO_TYPE, "materialinfo.json"))
-
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<MaterialInfo> materialInfoList = materialDao.selectMaterialInfo(params, p, dataSourceId, supplierCode)
-            if (!materialInfoList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                materialInfoList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_MATERIALINFO_INDEX, supplierCode), ESKeys.ES_ERP_MATERIALINFO_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                })
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引辅料出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引辅料,共" + materialInfoList.size() + "条记录")
-                }
-            }
-        })
-
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, materialDao, tableIdService, jsonConvert, logger, dataSourceId, supplierCode)

conf/script/1000/init/Init_28_Paper.Groovy

@@ -1,175 +0,0 @@
-import com.dderp.business.dao.PaperDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.datas.ESKeys
-import com.dderp.common.datas.RedisKeys
-import com.dderp.common.entity.paper.PaperBaseInfo
-import com.dderp.common.entity.paper.PaperBrand
-import com.dderp.common.entity.paper.PaperCutInfo
-import com.dderp.common.entity.paper.PaperCutSizeInfo
-import com.dderp.common.entity.paper.PaperInfo
-import com.dderp.common.entity.paper.PaperInfoType
-import com.dderp.common.entity.paper.PaperQuoteInfo
-import com.dySweetFishPlugin.elasticsearch.ESClient
-import com.dySweetFishPlugin.redis.RedisService
-import com.dySweetFishPlugin.sql.TableCodeNode
-import com.dySweetFishPlugin.sql.TableIdService
-import com.sweetfish.convert.json.JsonConvert
-import com.sweetfish.source.PageFlipper
-import com.sweetfish.util.Utility
-import org.apache.commons.lang3.StringUtils
-import org.apache.logging.log4j.Logger
-import org.elasticsearch.action.bulk.BulkRequestBuilder
-import org.elasticsearch.action.bulk.BulkResponse
-import org.elasticsearch.action.index.IndexRequestBuilder
-import org.elasticsearch.common.xcontent.XContentType
-import org.rex.RMap
-
-
-static def createRunnable(ESClient esClient, NoSqlKeysService keysService, TableIdService tableIdService,
-                          PaperDao paperDao, JsonConvert jsonConvert, Logger logger,
-                          RedisService redisService, String dataSourceId, long supplierCode) {
-    return {
-        RMap params = new RMap()
-        //纸张品牌档案
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_ERP_PAPER_BRAND, supplierCode))
-        Ignore_ExecPageFlipper.execute(1000, { PageFlipper p ->
-            List<PaperBrand> brandList = paperDao.selectPaperBrand(params, p, dataSourceId, supplierCode)
-            if (!brandList.isEmpty()) {
-                Map<String, String> brandMap = brandList.collectEntries { [String.valueOf(it.getId()), jsonConvert.convertTo(it)] }
-                redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_ERP_PAPER_BRAND, supplierCode), brandMap)
-            }
-        })
-
-        //纸张开纸档案
-        redisService.del(keysService.getRedisKey(RedisKeys.KEY_ERP_PAPER_CUT_INFO, supplierCode))
-        List<PaperCutInfo> cutInfoList = paperDao.queryPaperCutInfo(params, dataSourceId, supplierCode)
-
-        if (!cutInfoList.isEmpty()) {
-            RMap subParams = new RMap()
-            cutInfoList.forEach(x -> {
-                subParams.set("idCutInfo", x.getId())
-                List<PaperCutSizeInfo> sizeInfoList = paperDao.queryPaperCutSizeInfo(subParams, dataSourceId, supplierCode)
-                x.setSizeInfoList(sizeInfoList)
-            })
-            Map<String, String> cutInfoMap = cutInfoList.collectEntries { [String.valueOf(it.getId()), jsonConvert.convertTo(it)] }
-            redisService.hmset(keysService.getRedisKey(RedisKeys.KEY_ERP_PAPER_CUT_INFO, supplierCode), cutInfoMap)
-        }
-
-        //纸张类型档案
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERTYPE_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PAPERTYPE_TYPE, "papertype.json"))
-
-        Ignore_ExecPageFlipper.execute(500, { PageFlipper p ->
-            List<PaperInfoType> paperInfoTypeList = paperDao.selectPaperInfoType(params, p, dataSourceId, supplierCode)
-
-            if (!paperInfoTypeList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                paperInfoTypeList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERTYPE_INDEX, supplierCode), ESKeys.ES_ERP_PAPERTYPE_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-
-                    if (StringUtils.isNotBlank(x.getPaperTypeCode())) {
-                        tableIdService.addTableCodeNode(TableCodeNode.newBuilder()
-                                .codeName("tbPaperInfo.code." + x.getPaperTypeCode().trim())
-                                .tableName("tbPaperInfo")
-                                .codeFieldName("paperCode")
-                                .codePrefix(x.getPaperTypeCode())
-                                .codeYear(false)
-                                .yearLength(4)
-                                .codeMonth(false)
-                                .codeDay(false)
-                                .codeLength(4)
-                                .build(),
-                                true,
-                                dataSourceId,
-                                String.valueOf(supplierCode))
-                    }
-                })
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引纸张分类出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引纸张分类,共" + paperInfoTypeList.size() + "条记录")
-                }
-            }
-        })
-
-        //基础纸张档案
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERBASEINFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PAPERBASEINFO_TYPE, "paperbaseinfo.json"))
-
-        Ignore_ExecPageFlipper.execute(500, { PageFlipper p ->
-            List<PaperBaseInfo> paperBaseInfoList = paperDao.selectPaperBaseInfo(params, p, dataSourceId, supplierCode)
-            if (!paperBaseInfoList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                paperBaseInfoList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERBASEINFO_INDEX, supplierCode), ESKeys.ES_ERP_PAPERBASEINFO_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                })
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引纸张档案出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引纸张档案,共" + paperBaseInfoList.size() + "条记录")
-                }
-            }
-        })
-
-        //纸张报价档案
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERQUOTEINFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PAPERQUOTEINFO_TYPE, "paperquoteinfo.json"))
-
-        Ignore_ExecPageFlipper.execute(500, { PageFlipper p ->
-            List<PaperQuoteInfo> paperQuoteInfos = paperDao.selectPaperQuoteInfo(params, p, dataSourceId, supplierCode)
-            if (!paperQuoteInfos.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                paperQuoteInfos.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERQUOTEINFO_INDEX, supplierCode), ESKeys.ES_ERP_PAPERQUOTEINFO_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                })
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引纸张报价档案出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引纸张报价档案,共" + paperQuoteInfos.size() + "条记录")
-                }
-            }
-        })
-
-        //纸张档案
-        esClient.createIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERINFO_INDEX, supplierCode), ESKeys.INDEX_CONFIG,
-                Utility.ofMap(ESKeys.ES_ERP_PAPERINFO_TYPE, "paperinfo.json"))
-
-        Ignore_ExecPageFlipper.execute(500, { PageFlipper p ->
-            List<PaperInfo> paperInfoList = paperDao.selectPaperInfo(params, p, dataSourceId, supplierCode)
-            if (!paperInfoList.isEmpty()) {
-                BulkRequestBuilder bulkRequest = esClient.getClient().prepareBulk()
-                paperInfoList.forEach((x) -> {
-                    IndexRequestBuilder indexRequest = esClient.getClient()
-                            .prepareIndex(keysService.getESKey(ESKeys.ES_ERP_PAPERINFO_INDEX, supplierCode), ESKeys.ES_ERP_PAPERINFO_TYPE)
-                            .setId(String.valueOf(x.getId()))
-                            .setSource(jsonConvert.convertTo(x), XContentType.JSON)
-                    bulkRequest.add(indexRequest)
-                })
-                BulkResponse bulkResponse = bulkRequest.execute().actionGet()
-                if (bulkResponse.hasFailures()) {
-                    logger.error("索引纸张档案出错：" + bulkResponse.buildFailureMessage())
-                } else {
-                    logger.info("索引纸张档案,共" + paperInfoList.size() + "条记录")
-                }
-            }
-        })
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(esClient, keysService, tableIdService, paperDao, jsonConvert, logger, redisService, dataSourceId, supplierCode)

conf/script/1000/init/Run_2_TestGroovy.groovy

@@ -1,20 +0,0 @@
-import groovy.json.JsonSlurper
-
-def jsonSlurper = new JsonSlurper()
-
-def testTableJsonFile = new File(appHome + File.separator +
-        "conf" + File.separator +
-        "script" + File.separator +
-        supplierCode + File.separator +
-        "quoteFiles" + File.separator +
-        "testTable.json")
-def testTableJsonArray = jsonSlurper.parse(testTableJsonFile)
-
-
-
-logger.info(testTableJsonArray)
-logger.info(testTableJsonArray[0]["规格"])
-
-logger.info(testTableJsonArray.findQuotedElement(["规格": "正度", "开数": "16开"]))
-logger.info(testTableJsonArray.findQuotedElements(["规格": "正度", "开数": "16开"]))
-

conf/script/1000/init/Schedule_2_60_300_OrderCycle.groovy

@@ -1,78 +0,0 @@
-import com.dderp.business.dao.OrderDao
-import com.dderp.common.api.NoSqlKeysService
-import com.dderp.common.api.SupplierInitService
-import com.dderp.common.datas.RedisKeys
-import com.dderp.common.entity.order.OrderLifeCycle
-import com.dySweetFishPlugin.tool.lang.Holder
-import com.sweetfish.convert.json.JsonConvert
-import org.apache.logging.log4j.Logger
-
-//订单生命周期
-
-static def createRunnable(SupplierInitService supplierService, NoSqlKeysService keysService, OrderDao orderDao, JsonConvert jsonConvert, Logger logger, String dataSourceId, long supplierCode) {
-    return {
-        //lrange返回字符串列表
-        List<String> allJson = supplierService.redisListGetAndDel(keysService.getRedisKey(RedisKeys.KEY_ERP_ORDER_CYCLE_ITEM, supplierCode), 300)
-
-        List<OrderLifeCycle> itemList = allJson.collect { x -> (OrderLifeCycle) jsonConvert.convertFrom(OrderLifeCycle.class, x) }
-
-        if (!itemList.isEmpty()) {
-            //按操作方式分组
-            try {
-                logger.warn("开始写入订单生命周期记录")
-
-                Map<Integer, List<OrderLifeCycle>> groups = itemList.groupBy { it.dataKind }
-                //按顺序执行
-                Holder<Integer> itemInsertCount = Holder.of(0)
-                Holder<Integer> itemUpdateCount = Holder.of(0)
-                Holder<Integer> itemBreedCount = Holder.of(0)
-                Holder<Integer> itemDeleteCount = Holder.of(0)
-
-                groups.each { k, v ->
-                    if (k == 0) {
-                        orderDao.addOrderLifeCycleSync(v, dataSourceId, String.valueOf(supplierCode))
-                        itemInsertCount.set(v.size())
-                    }
-                }
-
-                groups.each { k, v ->
-                    if (k == 1) {
-                        orderDao.updateOrderLifeCycleSync(v, dataSourceId, String.valueOf(supplierCode))
-                        itemUpdateCount.set(v.size())
-                    }
-                }
-
-                groups.each { k, v ->
-                    if (k == 3) {
-                        orderDao.updateOrderLifeCycleByBreedSync(v, dataSourceId, String.valueOf(supplierCode))
-                        itemBreedCount.set(v.size())
-                    }
-                }
-
-                groups.each { k, v ->
-                    if (k == 2) {
-                        orderDao.deleteOrderLifeCycleSync(v, dataSourceId, String.valueOf(supplierCode))
-                        itemDeleteCount.set(v.size())
-                    }
-                }
-
-                logger.warn("写入订单生命周期记录：insert " + itemInsertCount.get()
-                        + " update " + itemUpdateCount.get()
-                        + " updateBreed " + itemBreedCount.get()
-                        + " delete " + itemDeleteCount.get()
-                )
-            } catch (Exception e) {
-                logger.error(e.getMessage(), e)
-            }
-
-        } else {
-            logger.warn("暂无订单生命周期记录")
-        }
-    } as Runnable
-}
-
-//groovy最后一个表达式的值为返回
-createRunnable(supplierService, keysService, orderDao, jsonConvert, logger, dataSourceId, supplierCode)
-
-
-