优化代码

java110

2022-06-08 64d648d13336ffbdbaa14324d6ec5333b20aa32a

 service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java

@@ -21,18 +21,21 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.language.Language;
import com.java110.dto.menuGroup.MenuGroupDto;
import com.java110.dto.store.StoreDto;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.IMenuCatalogV1InnerServiceSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.util.List;
@@ -65,7 +68,7 @@

        Assert.hasKeyAndValue(reqJson, "userId", "未包含用户信息");
        Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户信息");
        Assert.hasKeyAndValue(reqJson, "caId", "未包含目录信息");
        //Assert.hasKeyAndValue(reqJson, "caId", "未包含目录信息");
    }

    @Override
@@ -73,6 +76,7 @@

        MenuGroupDto menuCatalogDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
        menuCatalogDto.setGroupType(MenuGroupDto.GROUP_TYPE_PC);
        //判断是否 为 开发或者运营，如果是开发或者运营时 取消 小区ID

        //查询store 信息
        StoreDto storeDto = new StoreDto();
@@ -81,10 +85,22 @@

        Assert.listOnlyOne(storeDtos, "商户不存在");

        if (StoreDto.STORE_TYPE_ADMIN.equals(storeDtos.get(0).getStoreTypeCd()) || StoreDto.STORE_TYPE_DEV.equals(storeDtos.get(0).getStoreTypeCd())) {
            menuCatalogDto.setCommunityId("");
        }

        menuCatalogDto.setDomain(storeDtos.get(0).getStoreTypeCd());
        menuCatalogDto.setStoreType(storeDtos.get(0).getStoreTypeCd());

        List<Map> menus = menuCatalogV1InnerServiceSMOImpl.queryMenus(menuCatalogDto);
        String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
        if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
            Language language = ApplicationContextFactory.getBean(lang, Language.class);
            if (language != null) {
                menus = language.getMenuDto(menus);
            }

        }

        cmdDataFlowContext.setResponseEntity(refreshMenusInfo(menus));
    }
@@ -109,6 +125,7 @@
            //获取孩子菜单
            JSONArray childs = tempMenu.getJSONArray("childs");
            JSONObject childMenu = new JSONObject();
            childMenu.put("mId", tMenu.getString("mId"));
            childMenu.put("name", tMenu.getString("menuName"));
            childMenu.put("href", tMenu.getString("url"));
            childMenu.put("seq", tMenu.getString("menuSeq"));