fix: 测试修改

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反馈管芯入库完成"),
     /**
      * 标记符号

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>
-    <select id="queryPdaAuthority" resultType="com.alibaba.fastjson.JSONArray">
+    <select id="queryPdaAuthority" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         max( sys_user.user_id ) AS accountId,
         max( sys_user.username ) AS username,

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;
@@ -149,6 +149,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> 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)) {
@@ -158,6 +159,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         sysMenu.setSystem_type(rootMenu.getSystem_type());
         this.updateById(sysMenu);
     }
+
     private String findRootMenuId(String menuId) {
         SysMenu sysMenu = this.findById(menuId);
         if (StrUtil.isEmpty(sysMenu.getPid())) {

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<StIvtHotpointivt> hotPoints = hotpointivtService.getUnionBakedFinishPoint();

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.*;
 
 /**
  * 创建出烘箱任务