feature 优化排程数据问题

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/GanttServiceImpl.java

@@ -8,14 +8,12 @@ import com.rongwei.bscommon.sys.dao.ApsReportRecordsDao;
 import com.rongwei.bscommon.sys.service.ApsProcessOperationBackupService;
 import com.rongwei.bscommon.sys.service.ApsProcessOperationService;
 import com.rongwei.bscommon.sys.service.GanttService;
-import com.rongwei.bsentity.domain.ApsProcessOperationBackupDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationDo;
 import com.rongwei.bsentity.vo.GanttVos;
 import com.rongwei.bsentity.vo.ProcessOutputAndInputNumber;
 import com.rongwei.bsentity.vo.ScheduleGanttVo;
 import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
-import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.safecommon.utils.CXCommonUtils;
@@ -63,8 +61,7 @@ public class GanttServiceImpl implements GanttService {
     public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     public static final String DEFAULT_TYPE = "project";
     public static final String DEFAULT_RENDER = "split";
-    public static final String SCHEDULING_STR = "%s-正在排程 %s";
-    public static final String SCHEDULING_TO_BE_PUBLISHED_STR = "%s-排程结束待发布";
+    public static final String SCHEDULING_STR = "%s-%s %s";
     public static final String DEFAULT_SPLIT = "-;-";
     public static final Map<String, String> GANTT_PROCESS_STATUS_MAP = new HashMap<String, String>() {{
         put(JOBSTATUS_TO_BE_START, TO_BE_STARTED);
@@ -158,34 +155,29 @@ public class GanttServiceImpl implements GanttService {
         log.debug("判断工厂:{}是否正在排程", factoryId);
         RLock rLock = redissonClient.getLock(factoryId);
         log.debug("是否正在排程：{}", rLock.isLocked());
+        SysUserVo sysUserVo;
+        try {
+            sysUserVo = (SysUserVo) redisService.getRedisCatchObj("apsUser-" + factoryId);
+        } catch (Exception e) {
+            log.error("获取当前排程用户失败,原因：{}", e.toString());
+            return R.error("获取排程用户失败,请联系管理员");
+        }
+        if (sysUserVo == null) {
+            log.error("无法获取当前排程用户信息");
+            return R.ok("");
+        }
+        String returnMsg="";
         //正在排程直接返回
         if (rLock.isLocked()) {
-            try {
-                SysUserVo sysUserVo = (SysUserVo) redisService.getRedisCatchObj("apsUser-" + factoryId);
-                String returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), "");
-                if (StringUtils.isNotBlank(sysUserVo.getRoption())) {
-                    returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), "排程异常：" + sysUserVo.getRoption());
-                }
-                return R.ok(returnMsg);
-            } catch (Exception e) {
-                log.error("获取当前排程用户失败,原因：{}", e.toString());
-                return R.error("获取排程用户失败,请联系管理员");
+            returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), "正在排程", "");
+        } else {
+            if (StringUtils.isNotBlank(sysUserVo.getRoption())) {
+                returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), ":" + sysUserVo.getRoption());
+            } else {
+                returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), "排程结束", "");
             }
-
-        }
-        // 判断是否存在备份信息
-        List<ApsProcessOperationBackupDo> backUpInfo = apsProcessOperationBackupService.list(new LambdaQueryWrapper<ApsProcessOperationBackupDo>()
-                .eq(BaseDo::getDeleted, 0).eq(ApsProcessOperationBackupDo::getTenantid, factoryId));
-        if (backUpInfo.isEmpty()) {
-            log.debug("不存在排程备份信息");
-            // 不存在备份信息 直接返回
-            return R.ok("");
         }
-        ApsProcessOperationBackupDo backupDo = backUpInfo.stream()
-                .filter(info -> StringUtils.isNotBlank(info.getBackupuser()))
-                .findFirst()
-                .orElse(null);
-        return R.ok(String.format(SCHEDULING_TO_BE_PUBLISHED_STR, backupDo == null ? "" : backupDo.getBackupuser()));
+        return R.ok(returnMsg);
     }
 
     /**

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -461,7 +461,7 @@
         from aps_process_operation_process_equ apope
         left join aps_process_operation app on apope.PROCESSID = app.ID and app.DELETED='0'
         <where>
-              apope.ID != #{id}
+            apope.ID != #{id}
             AND  apope.PROCESSDEVICEID =#{equId}
             and ( #{oldStartDate} BETWEEN apope.PLANSTARTDATE AND  apope.PLANENDDATE
             OR  #{oldEndDate} BETWEEN apope.PLANSTARTDATE AND  apope.PLANENDDATE )