feature

1.排程中有些操作无法执行

bs-common/src/main/java/com/rongwei/safecommon/utils/ExportExceByEasyExcel.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.util.List;
 
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.WEEK_HIDDEN_DANGER_TASK;
@@ -26,11 +25,11 @@ import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.WEEK_HIDDEN_
  * @date 2024/02/02
  */
 @Component
-public class ExportExceByEasyExcel {
+public class ExportExcelByEasyExcel {
 
-    private static final Logger log = LoggerFactory.getLogger(ExportExceByEasyExcel.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(ExportExcelByEasyExcel.class.getName());
 
-    public static <T> String genarteExcel(String file, String originalFilename, String notifyId, List<T> data, Class<T> className) {
+    public static <T> String generateExcel(String file, String originalFilename, String notifyId, List<T> data, Class<T> className) {
         String returnStr = "";
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();) {
             ExcelWriter excelWriter = EasyExcel.write(byteArrayOutputStream).build();

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

@@ -146,7 +146,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void blankApsCancel(List<String> apsBlankIds) {
-        ApsUtils.checkScheduling();
+        ApsUtils.checkScheduling(null);
         if (ObjectUtil.isEmpty(apsBlankIds)) {
             log.debug("坯料计划排程取消参数为空");
             return;
@@ -167,7 +167,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R publish(List<String> blankIds) {
-        ApsUtils.checkScheduling();
+        ApsUtils.checkScheduling(null);
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
             return R.error("坯料计划id 必传");
@@ -253,7 +253,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R publishCancel(List<String> blankIds) {
-        ApsUtils.checkScheduling();
+        ApsUtils.checkScheduling(null);
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
             return R.error("坯料计划id 必传");
@@ -363,6 +363,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R orderLock(OrderLockVo orderLockVo) {
+        ApsUtils.checkScheduling(null);
         String lockMark = orderLockVo.getLockMark();
         if (StringUtils.isBlank(lockMark)) {
             log.error("锁定状态必填");
@@ -449,6 +450,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     public void apsReScheduling() throws Exception {
         //获取当前用户的所属工厂
         SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        ApsUtils.checkScheduling(currentUser);
         String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
 
 //        List<ApsBlankOrderVo> notLockOrders = apsBlankOrderDao.getNotLockOrders(tenantId);

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

@@ -216,7 +216,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R changingWires(List<ChangingWiresVo> changingWiresVos) {
-        ApsUtils.checkScheduling();
+        ApsUtils.checkScheduling(null);
         if (changingWiresVos.isEmpty()) {
             log.error("换线作业的工序作业不为空");
             return R.error("工序作业不能为空");
@@ -392,6 +392,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     @Transactional(rollbackFor = Exception.class)
     public R changeStartTime(List<ChangeStartTimeVo> changeStartTimeVos) {
         /// 设计到修改的工序作业ID
+        ApsUtils.checkScheduling(null);
         List<String> affectedIdList = new ArrayList<>();
         changeStartTimeVos.forEach(changeStartTimeVo -> {
             String id = changeStartTimeVo.getId();
@@ -453,6 +454,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R updateDetails(JobDetailsVo jobDetailsVo) {
+        ApsUtils.checkScheduling(null);
         List<String> affectedIdList = new ArrayList<>();
         String id = jobDetailsVo.getId();
         affectedIdList.add(id);

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

@@ -1339,6 +1339,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     @Override
     public R backupProcessOperation() {
         SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        ApsUtils.checkScheduling(currentUser);
         // 先删除
         ApsUtils.clearBackup(currentUser);
         List<ApsProcessOperationDo> apsProcessOperationDos = apsProcessOperationDao.selectList(
@@ -1364,6 +1365,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     public R backupRestoreProcessOperation() {
         log.debug("开始恢复工序作业备份信息");
         SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        ApsUtils.checkScheduling(currentUser);
         String factoryId = null;
         if (currentUser != null) {
             List<SysOrganizationVo> organizationDoList = currentUser.getOrganizationDoList();
@@ -1412,6 +1414,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
      */
     @Override
     public R cancelConflict(List<String> ids) {
+        ApsUtils.checkScheduling(null);
         List<String> collect = ids.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
         if (collect.isEmpty()) {
             log.error("参数异常");

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/utils/ApsUtils.java

@@ -33,7 +33,12 @@ public class ApsUtils {
     private ApsProcessOperationProcessEquBackupDao autoApsProcessOperationProcessEquBackupDao;
     @Autowired
     private RedissonClient autoredissonClient;
-
+    @PostConstruct
+    public void info() {
+        apsProcessOperationBackupDao = autoApsProcessOperationBackupDao;
+        apsProcessOperationProcessEquBackupDao = autoApsProcessOperationProcessEquBackupDao;
+        redissonClient = autoredissonClient;
+    }
     /**
      * 删除当前员工所属工厂的排程备份信息
      *
@@ -54,9 +59,11 @@ public class ApsUtils {
      * 校验当前是否正在排程中
      * 正在排程的情况下抛出异常
      */
-    public static void checkScheduling() {
+    public static void checkScheduling(SysUserVo currentUser ) {
         // 当前等路人所属工厂
-        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        if(currentUser==null){
+            currentUser = CXCommonUtils.getCurrentUser();
+        }
         String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
         if (StringUtils.isBlank(tenantId)) {
             throw new CustomException("当前用户所属工厂信息为空");
@@ -70,12 +77,7 @@ public class ApsUtils {
         }
     }
 
-    @PostConstruct
-    public void info() {
-        apsProcessOperationBackupDao = autoApsProcessOperationBackupDao;
-        apsProcessOperationProcessEquBackupDao = autoApsProcessOperationProcessEquBackupDao;
-        redissonClient = autoredissonClient;
-    }
+
 
 
 }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProcessOperationProcessEquController.java

@@ -66,7 +66,7 @@ public class ApsProcessOperationProcessEquController {
      */
     @PostMapping("/optional/equipment")
     public R getOptionalEquipment(@RequestBody List<String> operationJobDetailsId){
-        log.info("开始进行换线作业");
+        log.info("换线获取可选设备");
         return  apsProcessOperationProcessEquService.getOptionalEquipment(operationJobDetailsId);
     }
 

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SafeCheckSendNotifyServiceImpl.java

@@ -12,7 +12,7 @@ import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.safecommon.utils.CXCommonUtils;
-import com.rongwei.safecommon.utils.ExportExceByEasyExcel;
+import com.rongwei.safecommon.utils.ExportExcelByEasyExcel;
 import com.rongwei.sfcommon.sys.dao.DangerousDao;
 import com.rongwei.sfcommon.sys.dao.SaveCheckCommonDao;
 import com.rongwei.sfcommon.sys.service.SafeCheckSendNotifyService;
@@ -431,7 +431,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         // 消息提醒ID
         String notifyId = SecurityUtil.getUUID();
 
-        String fileNameAndId = ExportExceByEasyExcel.genarteExcel("file",WEEK_HIDDEN_DANGER_TASK + simpleDateFormat.format(new Date()) + XLSX ,
+        String fileNameAndId = ExportExcelByEasyExcel.generateExcel("file",WEEK_HIDDEN_DANGER_TASK + simpleDateFormat.format(new Date()) + XLSX ,
                 notifyId, exportData, ExportHiddenDangerVo.class);
         if(StringUtils.isBlank(fileNameAndId)){
             return;