对接修改

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

@@ -1,5 +1,6 @@
 package com.ktg.iscs.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -77,6 +78,16 @@ public class IsMaterialsCabinetController extends BaseController
         return CommonResult.success(isMaterialsCabinetService.selectIsMaterialsCabinetByCabinetId(cabinetId));
     }
 
+    @ApiOperation("获取物资柜详细信息")
+    @Parameter(name = "cabinetCode", description = "cabinetCode")
+    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:query')")
+    @GetMapping(value = "/selectIsMaterialsCabinetByCode")
+    public CommonResult<IsMaterialsCabinet> selectIsMaterialsCabinetByCode(String cabinetCode)
+    {
+        return CommonResult.success(isMaterialsCabinetService.getOne(Wrappers.<IsMaterialsCabinet>lambdaQuery()
+                .eq(IsMaterialsCabinet::getCabinetCode, cabinetCode)));
+    }
+
     /**
      * 新增物资柜
      */

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

@@ -142,9 +142,15 @@ public class TestIscsController extends BaseController
 
     @ApiOperation("测试websocket-----------")
     @GetMapping(value = "/testWebsocketLog")
-    public CommonResult<Boolean> testWebsocketLog(Long id, String name) {
-        Boolean b = isTicketOperLogService.addLog1(id, name);
-        return CommonResult.success(b);
+    public CommonResult<Boolean> testWebsocketLog(Long id, String name, String logType) {
+        if (logType.equals("启动作业")) {
+            Boolean b = isTicketOperLogService.addLog1(id, name);
+        }
+        if (logType.equals("启动上锁")) {
+            Boolean b = isTicketOperLogService.addLog4(id, name);
+        }
+
+        return CommonResult.success(true);
     }
 
 }

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

@@ -28,8 +28,8 @@ public class IsException extends BaseBean
     @TableId(type = IdType.AUTO)
     private Long exceptionId;
 
-    @ApiModelProperty(value = "异常种类(0-锁控柜 1-物资柜)")
-    @Excel(name = "异常种类(0-软件 1-硬件)")
+    @ApiModelProperty(value = "异常种类(1-锁控柜 2-物资柜)")
+    @Excel(name = "异常种类(1-锁控柜 2-物资柜)")
     private String exceptionCategory;
 
     @ApiModelProperty(value = "异常类型（字典exception_type）")

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

@@ -75,7 +75,7 @@ public interface IIsMaterialsLoanService extends IService<IsMaterialsLoan>
      * @param dto
      * @return
      */
-    Boolean returnIsMaterialsLoan(ReturnLoanDTO dto) throws Exception;
+    Boolean returnIsMaterialsLoan(ReturnLoanDTO dto);
 
     /**
      * 归还提醒

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

@@ -709,12 +709,22 @@ public class HardwareMaterialApiServiceImpl implements HardwareMaterialApiServic
                 .eq(IsMaterialsCheckPlan::getPlanId, planCabinet.getPlanId())
                 .eq(IsMaterialsCheckPlan::getCheckUserId, userId));
         Assert.isFalse(checkPlan == null, "当前物资柜无需您执行的检查计划！");
+        // 3.2查询此次检查记录
+        List<IsMaterialsCheckRecord> checkRecords = isMaterialsCheckRecordService.list(Wrappers.<IsMaterialsCheckRecord>lambdaQuery()
+                .eq(IsMaterialsCheckRecord::getPlanId, planCabinet.getPlanId()));
+        List<Long> checkMaterialsIds = null;
+        if (!checkRecords.isEmpty()) {
+            checkMaterialsIds = checkRecords.stream().map(IsMaterialsCheckRecord::getMaterialsId).collect(Collectors.toList());
+
+        }
         // 4.确实都存在，那就开始查数据了
         // 4.1 开始更新这个检查计划的状态，分为总状态和该物资柜的状态
         // updateCheckPlanStatus(planCabinet, checkPlan);
         // 4.2查询该物资柜的所有物资
         List<IsMaterials> materials = iIsMaterialsService.list(Wrappers.<IsMaterials>lambdaQuery()
-                .eq(IsMaterials::getMaterialsCabinetId, cabinet.getCabinetId()));
+                .in(checkMaterialsIds != null && !checkMaterialsIds.isEmpty(), IsMaterials::getMaterialsId, checkMaterialsIds)
+                .eq(IsMaterials::getMaterialsCabinetId, cabinet.getCabinetId())
+        );
         List<MaterialsCheckVO> materialsCheckVOS = new ArrayList<>();
         if (!materials.isEmpty()) {
             List<Long> typeIds = materials.stream().map(IsMaterials::getMaterialsTypeId).distinct().collect(Collectors.toList());
@@ -1083,7 +1093,6 @@ public class HardwareMaterialApiServiceImpl implements HardwareMaterialApiServic
         // 2.开始绑定
         if (!dto.getBindingMaterialRfidList().isEmpty()) {
             // 判定绑定的物资数据是否存在，存在的话是不是异常的数据
-
             iIsMaterialsService.update(Wrappers.<IsMaterials>lambdaUpdate()
                     .in(IsMaterials::getMaterialsRfid, dto.getBindingMaterialRfidList())
                     .set(IsMaterials::getMaterialsCabinetId, cabinetByCode.getCabinetId())
@@ -1101,6 +1110,18 @@ public class HardwareMaterialApiServiceImpl implements HardwareMaterialApiServic
                 isMaterialsChangeRecord.setChangeType("1");
                 isMaterialsChangeRecord.setOperateType("1");
                 isMaterialsChangeRecords.add(isMaterialsChangeRecord);
+                // 处理绑定入柜的物资的借取记录
+                iIsMaterialsLoanService.update(Wrappers.<IsMaterialsLoan>lambdaUpdate()
+                        .eq(IsMaterialsLoan::getMaterialsId, materials.getMaterialsId())
+                        .set(IsMaterialsLoan::getRestitutionUserId, SecurityUtils.getUserId())
+                        .set(IsMaterialsLoan::getActualRestitutionTime, new Date())
+                        .set(IsMaterialsLoan::getStatus, "1"));
+                // 处理归还异常
+                isMaterialsLoanExceptionService.update(Wrappers.<IsMaterialsLoanException>lambdaUpdate()
+                        .eq(IsMaterialsLoanException::getMaterialsId, materials.getMaterialsId())
+                        .set(IsMaterialsLoanException::getRestitutionUserId, SecurityUtils.getUserId())
+                        .set(IsMaterialsLoanException::getHandleTime, new Date())
+                        .set(IsMaterialsLoanException::getStatus, "1"));
             }
         }
         // 3.如果有数据则插入

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

@@ -495,7 +495,7 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
 
     @Transactional
     @Override
-    public Boolean returnIsMaterialsLoan(ReturnLoanDTO dto) throws Exception {
+    public Boolean returnIsMaterialsLoan(ReturnLoanDTO dto) {
         // try {
         Assert.notNull(dto.getMaterialsId(), "物资id不能为空！");
         Assert.notNull(dto.getRestitutionUserId(), "归还人id不能为空！");
@@ -510,7 +510,7 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
         );
         // Assert.isFalse(loanList.isEmpty(), "尚未找到该物资的借出信息!");
         // 如果没有借取信息 直接存储归还异常
-        if (loanList.isEmpty() || materials.getMaterialsCabinetId() == null) {
+        if (loanList.isEmpty() || materials.getMaterialsCabinetId() == null || materials.getMaterialsCabinetId() == 0) {
             IsMaterialsLoanException loanException = new IsMaterialsLoanException();
             loanException.setMaterialsId(dto.getMaterialsId());
             loanException.setMaterialsRfid(materials.getMaterialsRfid());

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

@@ -212,6 +212,7 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
                         IsMaterials materials = getOne(Wrappers.<IsMaterials>lambdaQuery()
                                 .eq(IsMaterials::getMaterialsRfid, dto.getMaterialsRfid()));
                         if (materials == null) {
+                            // 物资不存在
                             handleOutSystemMaterials(dto.getMaterialsRfid(), dto.getLoanState(), dto.getRestitutionToCabinetCode());
                             Assert.isFalse(true, "通过RFID:" + dto.getMaterialsRfid() + "未查询到物资！");
                             return "true";

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

@@ -59,7 +59,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(1);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(userName);
@@ -83,7 +83,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(2);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -101,7 +101,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(3);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -119,7 +119,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(4);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -137,7 +137,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(6);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -155,7 +155,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(7);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -173,7 +173,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(5);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -191,7 +191,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(8);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
@@ -227,7 +227,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         IsTicketOperLog isTicketOperLog = new IsTicketOperLog();
         isTicketOperLog.setTicketId(jobId);
         isTicketOperLog.setTicketName(jobName);
-        isTicketOperLog.setOperationType(0);
+        isTicketOperLog.setOperationType(9);
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);

ktg-iscs/src/main/resources/mapper/IsExceptionMapper.xml

@@ -10,7 +10,8 @@
         SELECT
         e.*,
         d.dict_label AS exception_category_name,
-        CASE WHEN e.exception_category = 1 THEN l.loto_name WHEN e.exception_category = 2 THEN m.cabinet_name END AS source_name,
+        CASE WHEN e.exception_category = 1 THEN l.loto_name WHEN e.exception_category = 2 THEN m.cabinet_name END AS
+        source_name,
         dd.dict_label AS exception_type_name,
         ddd.dict_label AS exception_level_name,
         u.nick_name AS raiser_name
@@ -51,12 +52,13 @@
             <if test="isException.status != null and isException.status.trim != ''">
                 and e.status = #{isException.status}
             </if>
-        </where>) a
-                   <where>
-                       <if test="isException.sourceName != null and isException.sourceName.trim != ''">
-                           and a.source_name like concat('%',#{isException.sourceName},'%')
-                       </if>
-                   </where>
+        </where>
+        ) a
+        <where>
+            <if test="isException.sourceName != null and isException.sourceName.trim != ''">
+                and a.source_name like concat('%',#{isException.sourceName},'%')
+            </if>
+        </where>
         order by a.exception_id desc
     </select>
     <select id="selectIsExceptionById" resultType="com.ktg.iscs.domain.IsException">