对接问题修改 2023-04-09

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -396,10 +396,9 @@ public class LabBoardApi {
      * @param labId
      * @return
      */
-    @ApiOperation(value = "刷卡是否可以开门禁 1可以，0不可以")
+    @ApiOperation(value = "刷卡是否可以开门禁")
     @GetMapping(value = "/getCardIsOpen")
     public ResultData getCardIsOpen(@RequestParam("labId") Long labId,@RequestParam("cardNum") String cardNum) {
-        Integer isOpen=0;
         ResultData resultData=remoteDutyService.securityNumList(labId,cardNum);
         if(resultData==null && resultData.getCode()!=HttpStatus.SUCCESS){
             return ResultData.fail("未识别到身份信息，请联系管理人员录入卡号信息");
@@ -408,8 +407,7 @@ public class LabBoardApi {
         if(null==resultObj){
             return ResultData.fail("未识别到身份信息，请联系管理人员录入卡号信息");
         }
-        isOpen=1;
-        return ResultData.success(isOpen);
+        return resultData;
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectServiceImpl.java

@@ -13,6 +13,7 @@ import com.zd.laboratory.domain.vo.LabClassifiedVo;
 import com.zd.laboratory.domain.vo.LabClasstypeVo;
 import com.zd.laboratory.domain.vo.LabSubjectVO;
 import com.zd.laboratory.domain.vo.XxpClassifyDetailVO;
+import com.zd.laboratory.interfaces.SysProperties;
 import com.zd.laboratory.mapper.LabHazardSubjectRelationMapper;
 import com.zd.laboratory.mapper.LabQpSubjectRelationMapper;
 import com.zd.laboratory.mapper.LabSubjectMapper;
@@ -550,6 +551,9 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
     @Override
     public Map<String,Object> selectLabSubjectInfoId(Long id) {
         Map<String,Object> labMap=labSubjectMapper.selectXxpLabSubjectById(id);
+        LabSubject labSubject=new LabSubject();
+        labSubject.setQrCodeUrl(labMap.get("id") + "-" + Optional.ofNullable(labMap.get("room")).orElse(""));
+        labMap.put("qrCode",labSubject.getQrCodeUrl());
         //进入检查
         //设置
         String checkIn=String.valueOf(labMap.get("check_in"));

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -1221,6 +1221,7 @@
         select t.id,
                t.name,
                cf.classified_name                                                         levelName,
+               t.room,
                cf.classified_color                                                        filedColor,
                (SELECT ct.type_name FROM lab_safe_classtype ct WHERE ct.id = t.`type_id`) typeName,
                t.qr_code                                                                   qrCode,