diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/TagNameEnum.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/TagNameEnum.java index efd04ee2f..4ceae5494 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/TagNameEnum.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/TagNameEnum.java @@ -27,6 +27,7 @@ public enum TagNameEnum { ERROR_GX_IN_OUT("管芯满入空出异常处理"), AUTO_CALL_EMPTY_BY_CZZC("自动称重暂存位叫空"), AUTO_IN_HOT("自动创建入烘箱"), + AUTO_IN_OUT("自动创建出烘箱"), ACS_FEEDBACK_TUBE_COMPLETE("ACS反馈管芯入库完成"), /** * 标记符号 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml index 5e59deeed..77a0d6a6f 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml @@ -99,7 +99,7 @@ ) t3 where childId != '0' - SELECT max( sys_user.user_id ) AS accountId, max( sys_user.username ) AS username, diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index ed0b58a83..367118b70 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -14,19 +14,19 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.constant.DictConstantPool; import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.common.domain.vo.MenuMetaVo; import org.nl.common.domain.vo.MenuVo; +import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CopyUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; import org.nl.config.language.LangProcess; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; -import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.ISysMenuService; import org.nl.system.service.menu.dao.SysMenu; import org.nl.system.service.menu.dao.mapper.SysMenuMapper; +import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.dto.MenuQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; @@ -66,7 +66,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List query(MenuQuery query, PageQuery page) { page.setSort("menu_sort DESC"); - if (StringUtils.isNotEmpty(query.getBlurry())){ + if (StringUtils.isNotEmpty(query.getBlurry())) { query.setPid(null); } Page menuPage = this.page(page.build(), query.build()); @@ -138,7 +138,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private void addSystemTypeDict(SysMenu resources) { Dict dict = sysDictMapper.selectOne(new QueryWrapper().eq("code", DictConstantPool.DICT_SYS_CODE).orderByDesc("value").last("limit 1")); - Integer currentType = dict!=null?Integer.valueOf(dict.getValue())+1:1; + Integer currentType = dict != null ? Integer.valueOf(dict.getValue()) + 1 : 1; Dict currentSysType = new Dict(); currentSysType.setDict_id(IdUtil.getStringId()); currentSysType.setCode(DictConstantPool.DICT_SYS_CODE); @@ -149,15 +149,17 @@ public class SysMenuServiceImpl extends ServiceImpl impl sysDictMapper.insert(currentSysType); resources.setSystem_type(String.valueOf(currentType)); } + private void updateRootSystemType(SysMenu sysMenu) { String rootMenuId = this.findRootMenuId(sysMenu.getMenu_id()); - if (sysMenu.getMenu_id().equals(rootMenuId)){ + if (sysMenu.getMenu_id().equals(rootMenuId)) { return; } SysMenu rootMenu = this.findById(rootMenuId); sysMenu.setSystem_type(rootMenu.getSystem_type()); this.updateById(sysMenu); } + private String findRootMenuId(String menuId) { SysMenu sysMenu = this.findById(menuId); if (StrUtil.isEmpty(sysMenu.getPid())) { @@ -176,12 +178,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl baseMapper.untiedMenu(menu.getMenu_id()); baseMapper.deleteById(menu.getMenu_id()); String pid = menu.getPid(); - if (StringUtils.isEmpty(pid)){ + if (StringUtils.isEmpty(pid)) { pids.add(pid); } updateSubCnt(pid); } - if (!CollectionUtils.isEmpty(pids)){ + if (!CollectionUtils.isEmpty(pids)) { sysDictMapper.delete(new QueryWrapper().in("para1", pids).eq("code", DictConstantPool.DICT_SYS_CODE)); } } @@ -193,8 +195,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl SysMenu menu = baseMapper.selectById(menuId); // 获取当前菜单的所有子菜单 String allChild = baseMapper.findAllChild(menuId); - List allChildIds = ObjectUtil.isNotEmpty(allChild)?Arrays.asList(allChild.split(",")):null; - if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())){ + List allChildIds = ObjectUtil.isNotEmpty(allChild) ? Arrays.asList(allChild.split(",")) : null; + if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())) { throw new BadRequestException(LangProcess.msg("login_childError")); } if (resources.getIframe()) { @@ -206,17 +208,17 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (resources.getPid().equals("0")) { resources.setPid(null); - if (StringUtils.isNotEmpty(menu.getPid())){ + if (StringUtils.isNotEmpty(menu.getPid())) { addSystemTypeDict(resources); } - }else { + } else { resources.setSystem_type(this.findById(resources.getPid()).getSystem_type()); } String oldPid = menu.getPid(); String newPid = resources.getPid(); // 记录的父节点ID - if (oldPid == null && newPid != null){ - sysDictMapper.delete(new QueryWrapper().eq("para1",menu.getMenu_id())); + if (oldPid == null && newPid != null) { + sysDictMapper.delete(new QueryWrapper().eq("para1", menu.getMenu_id())); } menu.setTitle(resources.getTitle()); menu.setComponent(resources.getComponent()); @@ -238,8 +240,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl updateSubCnt(oldPid); updateSubCnt(newPid); //更新SystemType - if (!resources.getSystem_type().equals(menu.getSystem_type())){ - this.update(new UpdateWrapper().set(DictConstantPool.DICT_SYS_CODE,resources.getSystem_type()).in("menu_id",allChildIds)); + if (!resources.getSystem_type().equals(menu.getSystem_type())) { + this.update(new UpdateWrapper().set(DictConstantPool.DICT_SYS_CODE, resources.getSystem_type()).in("menu_id", allChildIds)); } } @@ -357,7 +359,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl public MenuDto doToDto(SysMenu entity) { MenuDto menuDto = new MenuDto(); - if (ObjectUtil.isEmpty(entity)){ + if (ObjectUtil.isEmpty(entity)) { return menuDto; } menuDto.setEn_title(entity.getEn_title()); @@ -395,15 +397,15 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List buildMenus(String systemType) { Dict dict = sysDictMapper.selectOne(new QueryWrapper().eq("code", DictConstantPool.DICT_SYS_CODE).eq("value", systemType)); - if (dict == null || StringUtils.isEmpty(dict.getPara1())){ - throw new BadRequestException(LangProcess.msg("error_isNull",DictConstantPool.DICT_SYS_CODE)); + if (dict == null || StringUtils.isEmpty(dict.getPara1())) { + throw new BadRequestException(LangProcess.msg("error_isNull", DictConstantPool.DICT_SYS_CODE)); } String pid = dict.getPara1(); - List menuDtoList = baseMapper.findSystemMenu(SecurityUtils.getCurrentUserId(),systemType); + List menuDtoList = baseMapper.findSystemMenu(SecurityUtils.getCurrentUserId(), systemType); //移除系统级菜单 - menuDtoList.removeIf(a->a.getMenu_id().equals(pid)); + menuDtoList.removeIf(a -> a.getMenu_id().equals(pid)); List menuDtos = this.buildTree(CopyUtil.copyList(menuDtoList, MenuDto.class)); - return this.buildMenus(menuDtos,pid); + return this.buildMenus(menuDtos, pid); } @Override @@ -417,7 +419,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl MenuVo menuVo = new MenuVo(); menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getLocalTitle(lang)); // 一级目录需要加斜杠，不然会报警告 - menuVo.setPath(pid.equals(menuDTO.getPid())? "/" + menuDTO.getPath() : menuDTO.getPath()); + menuVo.setPath(pid.equals(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath()); menuVo.setHidden(menuDTO.getHidden()); // 如果不是外链 if (!menuDTO.getIframe()) { @@ -434,7 +436,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (menuDtoList != null && menuDtoList.size() != 0) { menuVo.setAlwaysShow(true); menuVo.setRedirect("noredirect"); - menuVo.setChildren(buildMenus(menuDtoList,pid)); + menuVo.setChildren(buildMenus(menuDtoList, pid)); // 处理是一级菜单并且没有子菜单的情况 } else if (StrUtil.isEmpty(menuDTO.getPid())) { MenuVo menuVo1 = new MenuVo(); @@ -463,7 +465,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List getMenusByRole(String roleId, String systemType, String category) { - baseMapper.getMenusByRole(systemType,category); + baseMapper.getMenusByRole(systemType, category); return null; } @@ -478,7 +480,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } //查询一级 JSONArray pa = baseMapper.queryPdaAuthority(accountId, "0", null); - if(ObjectUtil.isEmpty(pa)){ + if (ObjectUtil.isEmpty(pa)) { throw new BadRequestException("当前用户无菜单权限！"); } JSONObject result = new JSONObject(); @@ -496,7 +498,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl roleTree.add(row); } res.put("sonTree", roleTree); - result.put("rf_menu" + ("188".equals(res.getString("menu_id"))?1:0), res); + result.put("rf_menu" + ("188".equals(res.getString("menu_id")) ? 1 : 0), res); } returnjo.put("code", "1"); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoCreateOutHotTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoCreateOutHotTask.java index 34a93b36b..502b55abd 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoCreateOutHotTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoCreateOutHotTask.java @@ -2,10 +2,12 @@ package org.nl.wms.quartz; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.nl.config.lucene.TagNameEnum; import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService; import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; import org.nl.wms.sch.task_manage.tasks.hot.OutHotTrussTask; +import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +31,7 @@ public class AutoCreateOutHotTask { private OutHotTrussTask outHotTrussTask; @Transactional(rollbackFor = Exception.class) public void run() { + MDC.put(GeneralDefinition.MDC_KEY, TagNameEnum.AUTO_IN_OUT.getTag()); log.info("自动创建出烘箱任务开始执行..."); // 获取烘箱内部状态：烘烤完毕暂存中（04）、03但不需要烘烤的点位 List hotPoints = hotpointivtService.getUnionBakedFinishPoint(); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java index 597cc22ea..1e5aff8d1 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java @@ -26,11 +26,10 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import static org.nl.wms.util.PointUtils.*; -import static org.nl.wms.util.TaskUtils.checkTaskOptionStatus; -import static org.nl.wms.util.TaskUtils.setUpdateByPC; -import static org.nl.wms.util.TaskUtils.setUpdateByType; import static org.nl.wms.sch.task_manage.core.constant.RegionConstant.REGION_A1_HXZC; +import static org.nl.wms.util.PointUtils.hotClearPoint; +import static org.nl.wms.util.PointUtils.setHxUpdateByType; +import static org.nl.wms.util.TaskUtils.*; /** * 创建出烘箱任务