From 3e9a4b3480e6508f3c6f7ac8723509d8b1120d20 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期五, 22 十二月 2023 11:26:33 +0800 Subject: [PATCH] 代码整理 --- consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java | 68 +++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 30 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java similarity index 70% rename from consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java rename to consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java index a776d44..bdce8a6 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java @@ -1,4 +1,11 @@ -package com.consum.base.service; +package com.consum.base.service.impl; + +import com.consum.base.service.LWhWarningService; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.stereotype.Service; import com.consum.base.core.utils.MapperUtil; import com.consum.base.pojo.query.WhWarningQry; @@ -6,11 +13,6 @@ import com.walker.infrastructure.utils.CollectionUtils; import com.walker.infrastructure.utils.StringUtils; import com.walker.jdbc.service.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * @ClassName LWhWarningServiceImpl @@ -20,9 +22,11 @@ * @Version 1.0 **/ @Service -public class LWhWarningServiceImpl extends BaseServiceImpl { - private static String GET_WARNING_TYPE_NUM = "SELECT COUNT(1) AS total_num,count(CASE WHEN wareWarn.WARNING_TYPE=1 THEN 1 ELSE NULL END) AS up_num,count(CASE WHEN wareWarn.WARNING_TYPE=2 THEN 1 ELSE NULL END) AS low_num FROM WH_WARNING wareWarn LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 "; +public class LWhWarningServiceImpl extends BaseServiceImpl implements LWhWarningService { + private static String GET_WARNING_TYPE_NUM = + "SELECT COUNT(1) AS total_num,count(CASE WHEN wareWarn.WARNING_TYPE=1 THEN 1 ELSE NULL END) AS up_num,count(CASE WHEN wareWarn.WARNING_TYPE=2 THEN 1 ELSE NULL END) AS low_num FROM WH_WARNING wareWarn LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 "; + @Override public Map<String, Object> getWarningTypeNum(WhWarningQry param) { StringBuilder sql = new StringBuilder(GET_WARNING_TYPE_NUM); HashMap<String, Object> paramts = new HashMap<>(); @@ -30,7 +34,7 @@ sql.append(" AND wareWarn.states = :states"); paramts.put("states", param.getStates()); } - //鏈烘瀯 + // 鏈烘瀯 if (param.getAgencyId() != null) { sql.append(" and ware.AGENCY_ID=:agencyId"); paramts.put("agencyId", param.getAgencyId()); @@ -47,8 +51,10 @@ } - private static String GET_LIST_WITH_PAGE = "SELECT wareWarn.*,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME,basemodel.UNIT FROM WH_WARNING wareWarn LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareWarn.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareWarn.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 "; + private static String GET_LIST_WITH_PAGE = + "SELECT wareWarn.*,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME,basemodel.UNIT FROM WH_WARNING wareWarn LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareWarn.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareWarn.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 "; + @Override public GenericPager<Map<String, Object>> getListWithPage(WhWarningQry param) { StringBuilder sql = new StringBuilder(GET_LIST_WITH_PAGE); HashMap<String, Object> paramts = new HashMap<>(); @@ -56,13 +62,13 @@ sql.append(" AND wareWarn.states = :states"); paramts.put("states", param.getStates()); } - //鏈烘瀯 + // 鏈烘瀯 if (param.getAgencyId() != null) { sql.append(" and ware.AGENCY_ID=:agencyId"); -// paramts.put("lengthAgencyId", param.getAgencyId()); + // paramts.put("lengthAgencyId", param.getAgencyId()); paramts.put("agencyId", param.getAgencyId()); } - //浠撳簱绫诲瀷 + // 浠撳簱绫诲瀷 if (param.getWarehouseType() != null) { sql.append(" AND wareWarn.WAREHOUSE_TYPE = :warehouseType"); paramts.put("warehouseType", param.getWarehouseType()); @@ -71,24 +77,25 @@ sql.append(" AND wareWarn.WAREHOUSE_ID = :warehouseId"); paramts.put("warehouseId", param.getBaseWarehouseId()); } - //鐗╁搧鍚嶇О + // 鐗╁搧鍚嶇О if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) { sql.append(" AND goodsTemp.GOODS_NAME like :goodsTemplateName"); - paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); + paramts.put("goodsTemplateName", + StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); } if (param.getGoodsTemplateId() != null) { sql.append(" AND goodsTemp.id=:goodsTemplateId"); paramts.put("goodsTemplateId", param.getGoodsTemplateId()); } - //鍒嗙被 + // 鍒嗙被 if (param.getCategoryId() != null) { sql.append(" AND cate.id=:categoryId"); paramts.put("categoryId", param.getCategoryId()); } - //浠峰�肩被鍨� + // 浠峰�肩被鍨� if (param.getCostType() != null) { // 灏嗘暟瀛楄浆鎹负瀵瑰簲鐨勫瓧绗� - char costType = (char) ('A' + param.getCostType() - 1); + char costType = (char)('A' + param.getCostType() - 1); sql.append(" AND cate.CLASSIFICATION=':costType'"); paramts.put("costType", costType); } @@ -96,7 +103,7 @@ sql.append(" AND wareWarn.WARNING_TYPE=:warningType"); paramts.put("warningType", param.getWarningType()); } - //瑙勬牸鍨嬪彿 + // 瑙勬牸鍨嬪彿 if (param.getBaseGoodsModelsId() != null) { sql.append(" AND wareWarn.BASE_GOODS_MODELS_ID=:baseGoodsModelsId"); paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId()); @@ -113,18 +120,23 @@ * @param warehouseId * @param baseModelId */ - private String CHECK_KUCUN_PREFIX = "SELECT warnConf.*,goods.goods_Num,CASE WHEN warnConf.LOWER_LIMIT>=goods.goods_Num THEN 2 WHEN warnConf.UPPER_LIMIT<=goods.goods_Num THEN 1 END AS WARNING_TYPE FROM ("; - private String CHECK_KUCUN_CONFIG_PREFIX = "SELECT WAREHOUSE_TYPE,BASE_WAREHOUSE_ID,BASE_GOODS_MODELS_ID,LOWER_LIMIT,UPPER_LIMIT FROM WH_WARNING_CONFIG"; + private String CHECK_KUCUN_PREFIX = + "SELECT warnConf.*,goods.goods_Num,CASE WHEN warnConf.LOWER_LIMIT>=goods.goods_Num THEN 2 WHEN warnConf.UPPER_LIMIT<=goods.goods_Num THEN 1 END AS WARNING_TYPE FROM ("; + private String CHECK_KUCUN_CONFIG_PREFIX = + "SELECT WAREHOUSE_TYPE,BASE_WAREHOUSE_ID,BASE_GOODS_MODELS_ID,LOWER_LIMIT,UPPER_LIMIT FROM WH_WARNING_CONFIG"; private String CHECK_KUCUN_CONFIG_WHERE = " WHERE 1=1"; private String CHECK_KUCUN_CONFIG_JOINTKUCUN = ") warnConf LEFT JOIN ("; - private String CHECK_KUCUN_KUCUN_PREFIX = "SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_MODELS_ID,count(1) goods_Num FROM L_WH_GOODS"; + private String CHECK_KUCUN_KUCUN_PREFIX = + "SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_MODELS_ID,count(1) goods_Num FROM L_WH_GOODS"; private String CHECK_KUCUN_KUCUN_WHERE = " WHERE 1=1 and STATES=1"; private String CHECK_KUCUN_KUCUN_END = " GROUP BY BASE_GOODS_MODELS_ID)"; - private String CHECK_KUCUN_END = "goods ON goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID AND goods.WAREHOUSE_TYPE=warnConf.WAREHOUSE_TYPE AND goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID WHERE (warnConf.LOWER_LIMIT>=goods.goods_Num OR warnConf.UPPER_LIMIT<=goods.goods_Num)"; + private String CHECK_KUCUN_END = + "goods ON goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID AND goods.WAREHOUSE_TYPE=warnConf.WAREHOUSE_TYPE AND goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID WHERE (warnConf.LOWER_LIMIT>=goods.goods_Num OR warnConf.UPPER_LIMIT<=goods.goods_Num)"; + @Override public List<Map<String, Object>> checkKuCun(Short warehouseType, Long warehouseId, List<Long> baseModelIdList) { StringBuilder checkKucunPrefix = new StringBuilder(CHECK_KUCUN_PREFIX); StringBuilder checkKucunConfigPrefix = new StringBuilder(CHECK_KUCUN_CONFIG_PREFIX); @@ -155,13 +167,9 @@ paramMap.put("KuCunBaseModelIds", baseModelIdList); } - checkKucunPrefix.append(checkKucunConfigPrefix) - .append(checkKucunConfigWhere) - .append(checkKucunConfigJointkucun) - .append(checkKucunKucunPrefix) - .append(checkKucunKucunWhere) - .append(checkKucunKucunEnd) - .append(checkKucunEnd); + checkKucunPrefix.append(checkKucunConfigPrefix).append(checkKucunConfigWhere).append(checkKucunConfigJointkucun) + .append(checkKucunKucunPrefix).append(checkKucunKucunWhere).append(checkKucunKucunEnd) + .append(checkKucunEnd); return select(checkKucunPrefix.toString(), paramMap, new MapperUtil()); } -- Gitblit v1.9.1