修改

ktg-admin/src/main/resources/application.yml

@@ -11,8 +11,8 @@ ktg-mes:
   # 文件路径 示例（ Windows配置D:/ktg/uploadPath，Linux配置 /home/ktg/uploadPath）
   profile: /home/iscs
   # 部署到服务器时需要开启
-  prod: /prod-api
-  #prod:
+  #prod: /prod-api    #服务器nginx时开启
+  prod:
   # 获取ip地址开关
   addressEnabled: true
   # 验证码类型 math 数组计算 char 字符验证

ktg-iscs/src/main/java/com/ktg/iscs/controller/HardwareApiController.java

@@ -149,6 +149,14 @@ public class HardwareApiController extends BaseController
         return CommonResult.success(hardwareApiService.checkBeforeToUnlock(ticketId));
     }
 
+    @ApiOperation("重合点位数据解锁")
+    @Log(title = "重合点位数据解锁", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateCoincideToUnLock")
+    public CommonResult<Boolean> updateCoincideToUnLock(@RequestBody @Parameter(name = "dto", description = "修改数据类,放到body") CoincidePointToUnLockDTO dto)
+    {
+        return CommonResult.success(hardwareApiService.updateCoincideToUnLock(dto));
+    }
+
     // ----------------------------------批量更新硬件状态-------------------------------------------------------
     @ApiOperation("批量更新硬件状态")
     @Log(title = "批量更新硬件状态", businessType = BusinessType.UPDATE)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLockCabinetController.java

@@ -1,7 +1,5 @@
 package com.ktg.iscs.controller;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
@@ -20,7 +18,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -81,7 +78,7 @@ public class IsLockCabinetController extends BaseController
     @PostMapping("/insertIsLockCabinet")
     public CommonResult<Boolean> insertIsLockCabinet(@RequestBody @Parameter(name = "isLockCabinet", description = "新增数据类,放到body") IsLockCabinet isLockCabinet)
     {
-        return CommonResult.success(isLockCabinetService.save(isLockCabinet));
+        return CommonResult.success(isLockCabinetService.insertIsLockCabinet(isLockCabinet));
     }
 
     @ApiOperation("修改锁控机柜")
@@ -90,7 +87,7 @@ public class IsLockCabinetController extends BaseController
     @PostMapping("/updateIsLockCabinet")
     public CommonResult<Boolean> updateIsLockCabinet(@RequestBody @Parameter(name = "isLockCabinet", description = "修改数据类,放到body") IsLockCabinet isLockCabinet)
     {
-        return CommonResult.success(isLockCabinetService.updateById(isLockCabinet));
+        return CommonResult.success(isLockCabinetService.updateIsLockCabinet(isLockCabinet));
     }
 
     @ApiOperation("删除锁控机柜")
@@ -99,8 +96,6 @@ public class IsLockCabinetController extends BaseController
 	@PostMapping("/deleteIsLockCabinetByCabinetIds")
     public CommonResult<Boolean> deleteIsLockCabinetByCabinetIds(String cabinetIds)
     {
-        Assert.notBlank(cabinetIds, "请选择需要删除的数据!");
-        Long[] longIds = Convert.toLongArray(cabinetIds);
-        return CommonResult.success(isLockCabinetService.removeBatchByIds(Arrays.asList(longIds)));
+        return CommonResult.success(isLockCabinetService.deleteIsLockCabinetByCabinetIds(cabinetIds));
     }
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLockCabinetSlots.java

@@ -30,19 +30,19 @@ public class IsLockCabinetSlots extends BaseBean
 
     @ApiModelProperty(value = "锁柜序号")
     @Excel(name = "锁柜序号")
-    private String cabinetId;
+    private Long cabinetId;
 
     @ApiModelProperty(value = "仓位类型（0-钥匙 1-锁）")
     @Excel(name = "仓位类型", readConverterExp = "0=-钥匙,1=-锁")
     private String slotType;
 
-    @ApiModelProperty(value = "区域序号")
-    @Excel(name = "区域序号")
+    @ApiModelProperty(value = "行")
+    @Excel(name = "行")
     private String row;
 
-    @ApiModelProperty(value = "岗位序号")
-    @Excel(name = "岗位序号")
-    private String column;
+    @ApiModelProperty(value = "列")
+    @Excel(name = "列")
+    private String col;
 
     @ApiModelProperty(value = "是否被占用(0-否 1-是)")
     @Excel(name = "是否被占用(0-否 1-是)")

ktg-iscs/src/main/java/com/ktg/iscs/service/HardwareApiService.java

@@ -116,6 +116,13 @@ public interface HardwareApiService {
      */
     Boolean checkBeforeToUnlock(Long ticketId);
 
+    /**
+     * 重合点位数据解锁
+     * @param dto
+     * @return
+     */
+    Boolean updateCoincideToUnLock(CoincidePointToUnLockDTO dto);
+
     /**
      * 批量更新硬件状态
      * @param dto

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsLockCabinetService.java

@@ -14,4 +14,10 @@ public interface IIsLockCabinetService extends IService<IsLockCabinet> {
 
     Page<IsLockCabinet> getIsLockCabinetPage(Page<IsLockCabinet> page, IsLockCabinet isLockCabinet);
 
+    Boolean deleteIsLockCabinetByCabinetIds(String cabinetIds);
+
+    Boolean insertIsLockCabinet(IsLockCabinet isLockCabinet);
+
+    Boolean updateIsLockCabinet(IsLockCabinet isLockCabinet);
+
 }

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

@@ -477,7 +477,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                             .set(IsJobTicketUser::getJobStatus, "5"));
                 }
                 // 4.2开始更新因为重合点位，当时没有解锁的点位的数据
-                updateConflictPoints(point.getPointId(), key.getKeyId(), date, lock.getLockId());
+                // updateConflictPoints(point.getPointId(), key.getKeyId(), date, lock.getLockId());
             }
         }
         /*JobTicketUpdateProgressReqVO reqVO = new JobTicketUpdateProgressReqVO();
@@ -912,6 +912,35 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    @Override
+    public Boolean updateCoincideToUnLock(CoincidePointToUnLockDTO dto) {
+        if (!dto.getNoUnlockTicketPointsVOSet().isEmpty()) {
+            Date date = new Date();
+            for (JobTicketPointsVO jobTicketPointsVO : dto.getNoUnlockTicketPointsVOSet()) {
+                iIsJobTicketPointsService.update(Wrappers.<IsJobTicketPoints>lambdaUpdate()
+                        .eq(IsJobTicketPoints::getRecordId, jobTicketPointsVO.getRecordId())
+                        .set(IsJobTicketPoints::getUnlockedByKeyId, jobTicketPointsVO.getLockedByKeyId())
+                        .set(IsJobTicketPoints::getUnlockTime, date)
+                        .set(IsJobTicketPoints::getPointStatus, PointStatusEnum.REMOVE_LOCK.status));
+                // 3.1开始更新解锁时挂锁信息
+                iIsJobTicketLockService.update(Wrappers.<IsJobTicketLock>lambdaUpdate()
+                        .eq(IsJobTicketLock::getTicketId, jobTicketPointsVO.getTicketId())
+                        .eq(IsJobTicketLock::getLockId, jobTicketPointsVO.getLockId())
+                        .set(IsJobTicketLock::getLockStatus, LockStatusEnum.REMOVED_LOCK.status));
+                // 4.1如果都解锁了，则更新作业负责人的任务状态
+                int count = (int) iIsJobTicketPointsService.count(Wrappers.<IsJobTicketPoints>lambdaQuery()
+                        .ne(IsJobTicketPoints::getPointStatus, "2"));
+                if (count == 0) {
+                    iIsJobTicketUserService.update(Wrappers.<IsJobTicketUser>lambdaUpdate()
+                            .eq(IsJobTicketUser::getUserRole, isSystemAttributeService.getIsSystemAttributeByKey("role.jtlocker").getSysAttrValue())
+                            .eq(IsJobTicketUser::getTicketId, jobTicketPointsVO.getTicketId())
+                            .set(IsJobTicketUser::getJobStatus, "5"));
+                }
+            }
+        }
+        return true;
+    }
+
     @Override
     public Boolean updateHardwareEsStatus(ExDTO dto) {
         // 1.开始更新钥匙

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

@@ -1,14 +1,23 @@
 package com.ktg.iscs.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.utils.StringUtils;
 import com.ktg.iscs.domain.IsLockCabinet;
+import com.ktg.iscs.domain.IsLockCabinetSlots;
 import com.ktg.iscs.mapper.IsLockCabinetMapper;
+import com.ktg.iscs.mapper.IsLockCabinetSlotsMapper;
 import com.ktg.iscs.service.IIsLockCabinetService;
+import com.ktg.iscs.service.IIsLockCabinetSlotsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 锁控机柜Service业务层处理
  *
@@ -20,12 +29,56 @@ public class IsLockCabinetServiceImpl extends ServiceImpl<IsLockCabinetMapper, I
 
     @Autowired
     private IsLockCabinetMapper isLockCabinetMapper;
+    @Autowired
+    private IIsLockCabinetSlotsService iIsLockCabinetSlotsService;
 
     @Override
     public Page<IsLockCabinet> getIsLockCabinetPage(Page<IsLockCabinet> page, IsLockCabinet isLockCabinet) {
         Page<IsLockCabinet> result = page(page, Wrappers.<IsLockCabinet>lambdaQuery()
+                .like(StringUtils.isNotBlank(isLockCabinet.getCabinetCode()), IsLockCabinet::getCabinetCode, isLockCabinet.getCabinetCode())
+                .like(StringUtils.isNotBlank(isLockCabinet.getCabinetName()), IsLockCabinet::getCabinetName, isLockCabinet.getCabinetName())
+                .eq(StringUtils.isNotBlank(isLockCabinet.getIsOnline()), IsLockCabinet::getIsOnline, isLockCabinet.getIsOnline())
+                .eq(isLockCabinet.getWorkareId() != null, IsLockCabinet::getWorkareId, isLockCabinet.getWorkareId())
+                .eq(isLockCabinet.getWorkstationId() != null, IsLockCabinet::getWorkstationId, isLockCabinet.getWorkstationId())
+                .eq(StringUtils.isNotBlank(isLockCabinet.getStatus()), IsLockCabinet::getStatus, isLockCabinet.getStatus())
                 .orderByDesc(IsLockCabinet::getCabinetId));
         return result;
     }
 
+    @Override
+    public Boolean deleteIsLockCabinetByCabinetIds(String cabinetIds) {
+        Assert.notBlank(cabinetIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(cabinetIds);
+        List<Long> ids = Arrays.asList(longIds);
+        // 开始检测下面有没有正在使用的仓位信息，有的话不能删
+        List<IsLockCabinetSlots> list = iIsLockCabinetSlotsService.list(Wrappers.<IsLockCabinetSlots>lambdaQuery()
+                .in(IsLockCabinetSlots::getCabinetId, ids));
+        Assert.isTrue(list.isEmpty(), "请先清理柜子下的仓位信息！");
+        return removeBatchByIds(ids);
+    }
+
+    @Override
+    public Boolean insertIsLockCabinet(IsLockCabinet isLockCabinet) {
+        // 开始判断编码是否重复
+        if (StringUtils.isNotBlank(isLockCabinet.getCabinetCode())) {
+            List<IsLockCabinet> list = list(Wrappers.<IsLockCabinet>lambdaQuery()
+                    .eq(IsLockCabinet::getCabinetCode, isLockCabinet.getCabinetCode()));
+            Assert.isTrue(list.isEmpty(), "该编码已被使用，请更换！");
+        }
+        // 判断名称是否重复
+        List<IsLockCabinet> list1 = list(Wrappers.<IsLockCabinet>lambdaQuery()
+                .eq(IsLockCabinet::getCabinetName, isLockCabinet.getCabinetName()));
+        Assert.isTrue(list1.isEmpty(), "该名称已被使用，请更换！");
+        return save(isLockCabinet);
+    }
+
+    @Override
+    public Boolean updateIsLockCabinet(IsLockCabinet isLockCabinet) {
+        Assert.notNull(isLockCabinet.getCabinetId(), "逐渐id不能为空！");
+         
+
+
+        return updateById(isLockCabinet);
+    }
+
 }

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

@@ -3,6 +3,8 @@ package com.ktg.iscs.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.utils.StringUtils;
+import com.ktg.iscs.domain.IsLockCabinet;
 import com.ktg.iscs.domain.IsLockCabinetSlots;
 import com.ktg.iscs.mapper.IsLockCabinetSlotsMapper;
 import com.ktg.iscs.service.IIsLockCabinetSlotsService;
@@ -24,6 +26,11 @@ public class IsLockCabinetSlotsServiceImpl extends ServiceImpl<IsLockCabinetSlot
     @Override
     public Page<IsLockCabinetSlots> getIsLockCabinetSlotsPage(Page<IsLockCabinetSlots> page, IsLockCabinetSlots isLockCabinetSlots) {
         Page<IsLockCabinetSlots> result = page(page, Wrappers.<IsLockCabinetSlots>lambdaQuery()
+                .like(StringUtils.isNotBlank(isLockCabinetSlots.getSlotCode()), IsLockCabinetSlots::getSlotCode, isLockCabinetSlots.getSlotCode())
+                .eq(isLockCabinetSlots.getCabinetId() != null, IsLockCabinetSlots::getCabinetId, isLockCabinetSlots.getCabinetId())
+                .eq(StringUtils.isNotBlank(isLockCabinetSlots.getSlotType()), IsLockCabinetSlots::getSlotType, isLockCabinetSlots.getSlotType())
+                .eq(StringUtils.isNotBlank(isLockCabinetSlots.getIsOccupied()), IsLockCabinetSlots::getIsOccupied, isLockCabinetSlots.getIsOccupied())
+                .eq(StringUtils.isNotBlank(isLockCabinetSlots.getStatus()), IsLockCabinetSlots::getStatus, isLockCabinetSlots.getStatus())
                 .orderByDesc(IsLockCabinetSlots::getSlotId));
         return result;
     }

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

@@ -3,6 +3,8 @@ package com.ktg.iscs.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.utils.StringUtils;
+import com.ktg.iscs.domain.IsLockCabinetSlots;
 import com.ktg.iscs.domain.IsRfidToken;
 import com.ktg.iscs.mapper.IsRfidTokenMapper;
 import com.ktg.iscs.service.IIsRfidTokenService;
@@ -24,6 +26,10 @@ public class IsRfidTokenServiceImpl extends ServiceImpl<IsRfidTokenMapper, IsRfi
     @Override
     public Page<IsRfidToken> getIsRfidTokenPage(Page<IsRfidToken> page, IsRfidToken isRfidToken) {
         Page<IsRfidToken> result = page(page, Wrappers.<IsRfidToken>lambdaQuery()
+                .like(StringUtils.isNotBlank(isRfidToken.getRfidCode()), IsRfidToken::getRfidCode, isRfidToken.getRfidCode())
+                .like(StringUtils.isNotBlank(isRfidToken.getRfid()), IsRfidToken::getRfid, isRfidToken.getRfid())
+                .eq(StringUtils.isNotBlank(isRfidToken.getRfidType()), IsRfidToken::getRfidType, isRfidToken.getRfidType())
+                .eq(StringUtils.isNotBlank(isRfidToken.getStatus()), IsRfidToken::getStatus, isRfidToken.getStatus())
                 .orderByDesc(IsRfidToken::getRfidId));
         return result;
     }