修改单警柜接口

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetBoxServiceImpl.java

@@ -66,7 +66,7 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
             box.setCabinetId(cabinet.getId());
             box.setPower(boxReq.getPower());
             box.setEquipmentConfig(boxReq.getEquipmentConfig());
-            box.setBoxType(boxReq.getBoxType());
+            box.setBoxType(Integer.valueOf(boxReq.getBoxType()));
             box.setState(0);
             box.setBoxName(boxReq.getBoxName());
             box.setNum(boxReq.getNum());

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java

@@ -183,9 +183,8 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         // 判断组织机构是否存在
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
 
-
         List<CabinetDto> cabinetList = new ArrayList<>();
-        List<Cabinet> list = cabinetMapper.getAllCabinetsWithSingleCabinet(String.valueOf(req.getOrgId()),req.getContainType());
+        List<Cabinet> list = cabinetMapper.getAllCabinetsWithSingleCabinet(String.valueOf(req.getOrgId()), req.getContainType());
 
         if (list.size() == 0) {
             return new ArrayList<>();
@@ -194,11 +193,26 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         for (Cabinet cabinet : list) {
             CabinetDto cabinetDto = new CabinetDto();
             BeanPlusUtil.copyProperties(cabinet, cabinetDto);
-            cabinetDto.setOrgName(pubOrg.getOrgName());
-
-            cabinetList.add(cabinetDto);
+            List<CabinetBox> list1 = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
+                    .eq(CabinetBox::getCabinetId, cabinet.getId()));
+            List<CabinetBoxDto> cabinetBoxList = new ArrayList<>();
+            for (CabinetBox cabinetBox : list1) {
+                CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
+                BeanPlusUtil.copyProperties(cabinetBox, cabinetBoxDto);
+                // 查询箱门绑定的警员id和姓名
+                List<Policeman> policeList = policemanService.list(new LambdaQueryWrapper<Policeman>()
+                        .eq(Policeman::getCabinetBoxId, cabinetBox.getId()));
+                if (policeList.size() != 0) {
+                    Policeman policeman = policeList.get(0);
+                    cabinetBoxDto.setPoliceId(policeman.getId());
+                    cabinetBoxDto.setPoliceName(policeman.getName());
+                }
+                cabinetBoxDto.setNum(cabinetBox.getNum());
+                cabinetBoxList.add(cabinetBoxDto);
+            }
+            cabinetDto.setCabinetBoxList(cabinetBoxList);
+            cabinetList.add(cabinetDto); // 添加到cabinetList中
         }
-
         return cabinetList;
     }