修改单警柜接口

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetBoxPoliceMapper.java

@@ -2,6 +2,10 @@ package com.junmp.jyzb.mapper;
 
 import com.junmp.jyzb.entity.CabinetBoxPolice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.Policeman;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author lxh专属坐骑
@@ -11,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface CabinetBoxPoliceMapper extends BaseMapper<CabinetBoxPolice> {
 
+    List<Policeman> selectByBoxId(@Param("cabinetBoxId") String id);
 }
 
 

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +49,9 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
 
     @Resource
     private CabinetBoxPoliceService cabinetBoxPoliceService;
+
+    @Resource
+    private CabinetBoxPoliceMapper cabinetBoxPoliceMapper;
     @Autowired
     private RabbitMQSendMsg MQ;
 
@@ -177,9 +181,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<>();
@@ -188,11 +191,38 @@ 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;
+            if (StringUtils.isNotBlank(req.getContainType())) {
+                list1 = cabinetBoxService.list(
+                        new LambdaQueryWrapper<CabinetBox>()
+                                .eq(CabinetBox::getCabinetId, cabinet.getId())
+                                .eq(CabinetBox::getContainType, req.getContainType())
+                );
+            } else {
+                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()));
+                List<Policeman> policeList=cabinetBoxPoliceMapper.selectByBoxId(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;
     }
 

jyzb-biz/src/main/resources/mapper/CabinetBoxPoliceMapper.xml

@@ -17,4 +17,9 @@
         id,cabinet_box_id,police_id,
         cabinet_id,create_time,update_time
     </sql>
+    <select id="selectByBoxId" resultType="com.junmp.jyzb.entity.Policeman" parameterType="java.lang.String">
+        SELECT p.name,p.id FROM base_policeman p
+            JOIN base_cabinet_box_police cbp on p.id=cbp.police_id
+                           where cbp.cabinet_box_id=#{cabinetBoxId}
+    </select>
 </mapper>