对接修改

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/ticket/AddJobTicketDTO.java

@@ -46,11 +46,11 @@ public class AddJobTicketDTO
     private String ticketStatus;
 
     @ApiModelProperty(value = "作业票开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ticketStartTime;
 
     @ApiModelProperty(value = "作业票结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ticketEndTime;
 
     @ApiModelProperty(value = "隔离点的数据")

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -83,6 +83,9 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "挂锁ID")
     private Long lockId;
 
+    @ApiModelProperty(value = "辅件类型ID")
+    private Long locksetTypeId;
+
     @ApiModelProperty(value = "前置隔离点ID")
     private Long prePointId;
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -245,19 +245,20 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
                 .ne(IsJobTicket::getTicketId, dto.getTicketId()));
         Assert.isTrue(list.isEmpty(), "该编码已被使用!");
         // 1.4检查区域有没有变，区域变了的话隔离点肯定变了，因为隔离点是从区域数据中解析的
-        IsJobTicket isJobTicket = getById(dto.getTicketId());
+        // IsJobTicket isJobTicket = getById(dto.getTicketId());
         // 2.修改作业票
         IsJobTicket jobTicket = BeanUtils.toBean(dto, IsJobTicket.class);
         jobTicket.setUpdateTime(DateUtils.getNowDate());
         isJobTicketMapper.updateById(jobTicket);
 
         // 3.1检查隔离点有没有变更
-        List<Long> pointIds = dto.getPointsList().stream().map(IsJobTicketPoints::getPointId).collect(Collectors.toList());
+        /*List<Long> pointIds = dto.getPointsList().stream().map(IsJobTicketPoints::getPointId).collect(Collectors.toList());
         List<IsJobTicketPoints> isSopPoints = iIsJobTicketPointsService.list(Wrappers.<IsJobTicketPoints>lambdaQuery()
                 .eq(IsJobTicketPoints::getTicketId, dto.getTicketId())
-                .in(IsJobTicketPoints::getPointId, pointIds));
+                .in(IsJobTicketPoints::getPointId, pointIds));*/
         // 3.2如果查出来变更了，开始执行删除，重新增加一轮 / 当workarea变更也要全部换掉
-        if (pointIds.size() != isSopPoints.size() || !Objects.equals(isJobTicket.getWorkareaId(), dto.getWorkareaId())) {
+        // if (pointIds.size() != isSopPoints.size() || !Objects.equals(isJobTicket.getWorkareaId(), dto.getWorkareaId())) {
+        // 无法检测隔离点属性是否变更，直接清理重新新增
             iIsJobTicketPointsService.remove(Wrappers.<IsJobTicketPoints>lambdaQuery().eq(IsJobTicketPoints::getTicketId, dto.getTicketId()));
             // TODO 批量新增
             for (IsJobTicketPoints isJobTicketPoints : dto.getPointsList()) {
@@ -269,7 +270,15 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
                 jobTicketPoints.setPrePointId(isJobTicketPoints.getPrePointId());
                 iIsJobTicketPointsService.save(jobTicketPoints);
             }
-        }
+        // 3.2新增作业票和挂锁的关联关// 3.3新增作业票和锁具的关联关系 ----先清除
+        iIsJobTicketLockService.remove(Wrappers.<IsJobTicketLock>lambdaQuery()
+                .eq(IsJobTicketLock::getTicketId, dto.getTicketId()));
+        iIsJobTicketLocksetService.remove(Wrappers.<IsJobTicketLockset>lambdaQuery()
+                .eq(IsJobTicketLockset::getJobTicketId, dto.getTicketId()));
+        List<Long> pointIds = dto.getPointsList().stream().map(IsJobTicketPoints::getPointId).collect(Collectors.toList());
+        List<IsIsolationPoint> pointList = iIsIsolationPointService.listByIds(pointIds);
+        saveJobTicketLockAndSet(pointList, jobTicket.getTicketId());
+        // }
         // 4.修改人员信息，先删后增
         iIsJobTicketUserService.remove(Wrappers.<IsJobTicketUser>lambdaQuery()
                 .eq(IsJobTicketUser::getTicketId, dto.getTicketId()));
@@ -311,6 +320,9 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         // 3.3同时删除is_job_ticket_lockset
         iIsJobTicketLocksetService.remove(Wrappers.<IsJobTicketLockset>lambdaQuery()
                 .in(IsJobTicketLockset::getJobTicketId, longIds));
+        // 3.4同时删除is_job_ticket_user
+        iIsJobTicketUserService.remove(Wrappers.<IsJobTicketUser>lambdaQuery()
+                .in(IsJobTicketUser::getTicketId, longIds));
         return true;
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSopServiceImpl.java

@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -159,14 +158,15 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
         // 1.判断隔离点必选
         Assert.isFalse(dto.getPointsList().isEmpty(), "隔离点id不可为空!");
         // 1.1检查区域有没有变，区域变了的话隔离点肯定变了，因为隔离点是从区域数据中解析的
-        IsSop sop = getById(dto.getSopId());
+        // IsSop sop = getById(dto.getSopId());
         // 2.开始检查隔离点有没有变更
-        List<Long> poindList = dto.getPointsList().stream().map(IsJobTicketPoints::getPointId).collect(Collectors.toList());
+        /*List<Long> poindList = dto.getPointsList().stream().map(IsJobTicketPoints::getPointId).collect(Collectors.toList());
         List<IsSopPoints> isSopPoints = iIsSopPointsService.list(Wrappers.<IsSopPoints>lambdaQuery()
                 .eq(IsSopPoints::getSopId, dto.getSopId())
-                .in(IsSopPoints::getPointId, poindList));
+                .in(IsSopPoints::getPointId, poindList));*/
         // 2.1如果查出来变更了，开始执行删除，重新增加一轮 / 区域变更则点位必然改变，也需要删除
-        if (dto.getPointsList().size() != isSopPoints.size() || !sop.getWorkareaId().equals(dto.getWorkareaId())) {
+        // if (dto.getPointsList().size() != isSopPoints.size() || !sop.getWorkareaId().equals(dto.getWorkareaId())) {
+        // 直接删除，点位变更前置节点属性啥的，无法检测，只能删了重新加一波
             iIsSopPointsService.remove(Wrappers.<IsSopPoints>lambdaQuery().eq(IsSopPoints::getSopId, dto.getSopId()));
             // TODO 批量新增
             for (IsJobTicketPoints isJobTicketPoints : dto.getPointsList()) {
@@ -177,7 +177,7 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
                 newSopPoints.setPrePointId(isJobTicketPoints.getPrePointId());
                 iIsSopPointsService.save(newSopPoints);
             }
-        }
+        // }
         // 3.新增人员信息到模板
         // 3.1先清除原先的人员数据
         iIsSopUserService.remove(Wrappers.<IsSopUser>lambdaQuery().eq(IsSopUser::getSopId, dto.getSopId()));
@@ -212,13 +212,18 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
         Long[] longIds = Convert.toLongArray(sopIds);
         isSopMapper.deleteIsSopBySopIds(longIds);
         // 3.同时删除is_sop_points关联数据
-        List<IsSopPoints> isSopPointsList = iIsSopPointsService.list(Wrappers.<IsSopPoints>lambdaQuery()
+        /*List<IsSopPoints> isSopPointsList = iIsSopPointsService.list(Wrappers.<IsSopPoints>lambdaQuery()
                 .in(IsSopPoints::getSopId, longIds));
         Set<Long> recordIds = isSopPointsList.stream().map(IsSopPoints::getRecordId).collect(Collectors.toSet());
         if (!recordIds.isEmpty()) {
             String rids = StringUtils.join(recordIds.toArray(), ",");
             iIsSopPointsService.deleteIsSopPointsByRecordIds(rids);
-        }
+        }*/
+        iIsSopPointsService.remove(Wrappers.<IsSopPoints>lambdaQuery()
+                .in(IsSopPoints::getSopId, longIds));
+        // 4.同时删除is_sop_user关联数据
+        iIsSopUserService.remove(Wrappers.<IsSopUser>lambdaQuery()
+                .in(IsSopUser::getSopId, longIds));
         return true;
     }
 

ktg-system/src/main/java/com/ktg/system/mapper/SysAutoCodeRuleMapper.java

@@ -1,10 +1,11 @@
 package com.ktg.system.mapper;
 
 import com.ktg.common.core.domain.entity.SysAutoCodeRule;
+import com.ktg.common.mapper.BaseMapperX;
 
 import java.util.List;
 
-public interface SysAutoCodeRuleMapper {
+public interface SysAutoCodeRuleMapper extends BaseMapperX<SysAutoCodeRule>{
 
     public List<SysAutoCodeRule> selectSysAutoCodeResultList(SysAutoCodeRule sysAutoCodeRule);
 

ktg-system/src/main/java/com/ktg/system/service/IAutoCodeRuleService.java

@@ -1,10 +1,11 @@
 package com.ktg.system.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.common.core.domain.entity.SysAutoCodeRule;
 
 import java.util.List;
 
-public interface IAutoCodeRuleService {
+public interface IAutoCodeRuleService extends IService<SysAutoCodeRule>{
 
     public SysAutoCodeRule getOne(String ruleCode);
 

ktg-system/src/main/java/com/ktg/system/service/impl/SysAutoCodeRuleServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ktg.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.constant.UserConstants;
 import com.ktg.common.core.domain.entity.SysAutoCodeRule;
 import com.ktg.common.utils.StringUtils;
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class SysAutoCodeRuleServiceImpl implements IAutoCodeRuleService {
+public class SysAutoCodeRuleServiceImpl extends ServiceImpl<SysAutoCodeRuleMapper, SysAutoCodeRule> implements IAutoCodeRuleService {
 
     @Autowired
     private SysAutoCodeRuleMapper sysAutoCodeRuleMapper;

ktg-system/src/main/java/com/ktg/system/strategy/AutoCodeUtil.java

@@ -2,6 +2,7 @@ package com.ktg.system.strategy;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.domain.entity.SysAutoCodePart;
 import com.ktg.common.core.domain.entity.SysAutoCodeResult;
@@ -42,7 +43,9 @@ public class AutoCodeUtil {
     public String genSerialCode(String ruleCode, String inputCharacter) {
 
         //查找编码规则
-        SysAutoCodeRule rule = iAutoCodeRuleService.getOne(ruleCode);
+        // SysAutoCodeRule rule = iAutoCodeRuleService.getOne(ruleCode);
+        SysAutoCodeRule rule = iAutoCodeRuleService.getOne(Wrappers.<SysAutoCodeRule>lambdaQuery()
+                .eq(SysAutoCodeRule::getRuleCode, ruleCode));
         Assert.notNull(rule, "未获取到指定类型:[{}]的业务编码生成规则", ruleCode);
 
         //查找规则组成