对接物资柜

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

@@ -8,6 +8,7 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsMaterialsCabinet;
+import com.ktg.iscs.domain.vo.cabinet.IsMaterialsCabinetVO;
 import com.ktg.iscs.service.IIsMaterialsCabinetService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,11 +45,9 @@ public class IsMaterialsCabinetController extends BaseController
     })
     // @PreAuthorize("@ss.hasPermi('iscs:cabinet:list')")
     @GetMapping("/getIsMaterialsCabinetPage")
-    public CommonResult<Page<IsMaterialsCabinet>> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet)
+    public CommonResult<Page<IsMaterialsCabinetVO>> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet)
     {
-        Page<IsMaterialsCabinet> result = isMaterialsCabinetService.page(page, Wrappers.<IsMaterialsCabinet>lambdaQuery()
-                .orderByDesc(IsMaterialsCabinet::getCabinetId));
-        return CommonResult.success(result);
+        return CommonResult.success(isMaterialsCabinetService.getIsMaterialsCabinetPage(page, isMaterialsCabinet));
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/cabinet/IsMaterialsCabinetVO.java

@@ -0,0 +1,55 @@
+package com.ktg.iscs.domain.vo.cabinet;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物资柜对象 is_materials_cabinet
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsMaterialsCabinetVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "物资柜ID")
+    @TableId(type = IdType.AUTO)
+    private Long cabinetId;
+
+    @ApiModelProperty(value = "物资柜编号")
+    @Excel(name = "物资柜编号")
+    private String cabinetCode;
+
+    @ApiModelProperty(value = "物资柜名称")
+    @Excel(name = "物资柜名称")
+    private String cabinetName;
+
+    @ApiModelProperty(value = "硬件ID")
+    @Excel(name = "硬件ID")
+    private Long hardwareId;
+
+    @ApiModelProperty(value = "硬件Name")
+    @Excel(name = "硬件Name")
+    private String hardwareName;
+
+    @ApiModelProperty(value = "区域ID")
+    @Excel(name = "区域ID")
+    private Long workareaId;
+
+    @ApiModelProperty(value = "区域Name")
+    @Excel(name = "区域Name")
+    private String workareaName;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMaterialsCabinetMapper.java

@@ -1,8 +1,11 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsMaterialsCabinet;
+import com.ktg.iscs.domain.vo.cabinet.IsMaterialsCabinetVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +65,6 @@ public interface IsMaterialsCabinetMapper extends BaseMapperX<IsMaterialsCabinet
      * @return 结果
      */
     int deleteIsMaterialsCabinetByCabinetIds(Long[] cabinetIds);
+
+    Page<IsMaterialsCabinetVO> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, @Param(value = "dto") IsMaterialsCabinet dto);
 }

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

@@ -1,7 +1,9 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMaterialsCabinet;
+import com.ktg.iscs.domain.vo.cabinet.IsMaterialsCabinetVO;
 
 import java.util.List;
 
@@ -60,4 +62,12 @@ public interface IIsMaterialsCabinetService extends IService<IsMaterialsCabinet>
      * @return 结果
      */
     int deleteIsMaterialsCabinetByCabinetId(Long cabinetId);
+
+    /**
+     * 查询物资柜列表
+     *
+     * @param isMaterialsCabinet 物资柜
+     * @return 物资柜集合
+     */
+    Page<IsMaterialsCabinetVO> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet);
 }

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

@@ -296,7 +296,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
             IsLock lock = iIsLockService.getOne(Wrappers.<IsLock>lambdaQuery()
                     .eq(IsLock::getLockNfc, dto.getLockNfc()));
             Assert.notNull(lock, "该nfc无对应的挂锁信息");
-            // 1..通过nfc查询钥匙信息
+            // 1.1通过nfc查询钥匙信息
             IsKey key = isKeyService.getOne(Wrappers.<IsKey>lambdaQuery()
                     .eq(IsKey::getKeyNfc, dto.getKeyNfc()));
             Assert.notNull(lock, "该nfc无对应的钥匙信息");

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

@@ -1,10 +1,12 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.iscs.domain.IsMaterialsCabinet;
+import com.ktg.iscs.domain.vo.cabinet.IsMaterialsCabinetVO;
 import com.ktg.iscs.mapper.IsMaterialsCabinetMapper;
 import com.ktg.iscs.service.IIsMaterialsCabinetService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,4 +101,9 @@ public class IsMaterialsCabinetServiceImpl extends ServiceImpl<IsMaterialsCabine
     {
         return isMaterialsCabinetMapper.deleteIsMaterialsCabinetByCabinetId(cabinetId);
     }
+
+    @Override
+    public Page<IsMaterialsCabinetVO> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet) {
+        return isMaterialsCabinetMapper.getIsMaterialsCabinetPage(page, isMaterialsCabinet);
+    }
 }

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsMaterialsCabinetMapper">
-    
+
     <resultMap type="IsMaterialsCabinet" id="IsMaterialsCabinetResult">
         <result property="cabinetId"    column="cabinet_id"    />
         <result property="cabinetCode"    column="cabinet_code"    />
@@ -24,19 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsMaterialsCabinetList" parameterType="IsMaterialsCabinet" resultMap="IsMaterialsCabinetResult">
         <include refid="selectIsMaterialsCabinetVo"/>
-        <where>  
+        <where>
             <if test="cabinetCode != null  and cabinetCode != ''"> and cabinet_code = #{cabinetCode}</if>
             <if test="cabinetName != null  and cabinetName != ''"> and cabinet_name like concat('%', #{cabinetName}, '%')</if>
             <if test="hardwareId != null "> and hardware_id = #{hardwareId}</if>
             <if test="workareaId != null "> and workarea_id = #{workareaId}</if>
         </where>
     </select>
-    
+
     <select id="selectIsMaterialsCabinetByCabinetId" parameterType="Long" resultMap="IsMaterialsCabinetResult">
         <include refid="selectIsMaterialsCabinetVo"/>
         where cabinet_id = #{cabinetId}
     </select>
-        
+
     <insert id="insertIsMaterialsCabinet" parameterType="IsMaterialsCabinet" useGeneratedKeys="true" keyProperty="cabinetId">
         insert into is_materials_cabinet
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -87,9 +87,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsMaterialsCabinetByCabinetIds" parameterType="String">
-        delete from is_materials_cabinet where cabinet_id in 
+        delete from is_materials_cabinet where cabinet_id in
         <foreach item="cabinetId" collection="array" open="(" separator="," close=")">
             #{cabinetId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsMaterialsCabinetPage" resultType="com.ktg.iscs.domain.vo.cabinet.IsMaterialsCabinetVO">
+        SELECT
+        c.*,
+        h.hardware_name,
+        w.workarea_name
+        FROM
+        is_materials_cabinet c
+        LEFT JOIN is_hardware h ON c.hardware_id = h.id
+        LEFT JOIN is_workarea w ON c.workarea_id = w.workarea_id
+        <where>
+            <if test="dto.cabinetCode != null and dto.cabinetCode.trim != ''">
+                and c.cabinet_code like concat('%',#{dto.cabinetCode},'%')
+            </if>
+            <if test="dto.cabinetName != null and dto.cabinetName.trim != ''">
+                and c.cabinet_name like concat('%',#{dto.cabinetName},'%')
+            </if>
+        </where>
+        ORDER BY
+        c.cabinet_id DESC
+
+    </select>
+
+</mapper>