修改锁具查询数据

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/lockset/LocksetController.java

@@ -1,95 +1,94 @@
-package cn.iocoder.yudao.module.iscs.controller.admin.lockset;
-
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
-import cn.iocoder.yudao.module.iscs.service.lockset.LocksetService;
-
-@Tag(name = "管理后台 - 锁具")
-@RestController
-@RequestMapping("/iscs/lockset")
-@Validated
-public class LocksetController {
-
-    @Resource
-    private LocksetService locksetService;
-
-    @PostMapping("/insertLockset")
-    @Operation(summary = "创建锁具")
-    @PreAuthorize("@ss.hasPermission('iscs:lockset:create')")
-    public CommonResult<Long> insertLockset(@Valid @RequestBody LocksetSaveReqVO createReqVO) {
-        return success(locksetService.createLockset(createReqVO));
-    }
-
-    @PutMapping("/updateLockset")
-    @Operation(summary = "更新锁具")
-    @PreAuthorize("@ss.hasPermission('iscs:lockset:update')")
-    public CommonResult<Boolean> updateLockset(@Valid @RequestBody LocksetSaveReqVO updateReqVO) {
-        locksetService.updateLockset(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/deleteLocksetList")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除锁具")
-                @PreAuthorize("@ss.hasPermission('iscs:lockset:delete')")
-    public CommonResult<Boolean> deleteLocksetList(@RequestParam("ids") List<Long> ids) {
-        locksetService.deleteLocksetListByIds(ids);
-        return success(true);
-    }
-
-    @GetMapping("/selectLocksetById")
-    @Operation(summary = "获得锁具")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('iscs:lockset:query')")
-    public CommonResult<LocksetRespVO> selectLocksetById(@RequestParam("id") Long id) {
-        LocksetDO lockset = locksetService.getLockset(id);
-        return success(BeanUtils.toBean(lockset, LocksetRespVO.class));
-    }
-
-    @GetMapping("/getLocksetPage")
-    @Operation(summary = "获得锁具分页")
-    @PreAuthorize("@ss.hasPermission('iscs:lockset:query')")
-    public CommonResult<PageResult<LocksetRespVO>> getLocksetPage(@Valid LocksetPageReqVO pageReqVO) {
-        PageResult<LocksetDO> pageResult = locksetService.getLocksetPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, LocksetRespVO.class));
-    }
-
-    @GetMapping("/exportLocksetExcel")
-    @Operation(summary = "导出锁具 Excel")
-    @PreAuthorize("@ss.hasPermission('iscs:lockset:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportLocksetExcel(@Valid LocksetPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<LocksetDO> list = locksetService.getLocksetPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "锁具.xls", "数据", LocksetRespVO.class,
-                        BeanUtils.toBean(list, LocksetRespVO.class));
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.controller.admin.lockset;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
+import cn.iocoder.yudao.module.iscs.service.lockset.LocksetService;
+
+@Tag(name = "管理后台 - 锁具")
+@RestController
+@RequestMapping("/iscs/lockset")
+@Validated
+public class LocksetController {
+
+    @Resource
+    private LocksetService locksetService;
+
+    @PostMapping("/insertLockset")
+    @Operation(summary = "创建锁具")
+    @PreAuthorize("@ss.hasPermission('iscs:lockset:create')")
+    public CommonResult<Long> insertLockset(@Valid @RequestBody LocksetSaveReqVO createReqVO) {
+        return success(locksetService.createLockset(createReqVO));
+    }
+
+    @PutMapping("/updateLockset")
+    @Operation(summary = "更新锁具")
+    @PreAuthorize("@ss.hasPermission('iscs:lockset:update')")
+    public CommonResult<Boolean> updateLockset(@Valid @RequestBody LocksetSaveReqVO updateReqVO) {
+        locksetService.updateLockset(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/deleteLocksetList")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除锁具")
+                @PreAuthorize("@ss.hasPermission('iscs:lockset:delete')")
+    public CommonResult<Boolean> deleteLocksetList(@RequestParam("ids") List<Long> ids) {
+        locksetService.deleteLocksetListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/selectLocksetById")
+    @Operation(summary = "获得锁具")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iscs:lockset:query')")
+    public CommonResult<LocksetRespVO> selectLocksetById(@RequestParam("id") Long id) {
+        LocksetDO lockset = locksetService.getLockset(id);
+        return success(BeanUtils.toBean(lockset, LocksetRespVO.class));
+    }
+
+    @GetMapping("/getLocksetPage")
+    @Operation(summary = "获得锁具分页")
+    @PreAuthorize("@ss.hasPermission('iscs:lockset:query')")
+    public CommonResult<PageResult<LocksetRespVO>> getLocksetPage(@Valid LocksetPageReqVO pageReqVO) {
+        PageResult<LocksetRespVO> pageResult = locksetService.getLocksetPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/exportLocksetExcel")
+    @Operation(summary = "导出锁具 Excel")
+    @PreAuthorize("@ss.hasPermission('iscs:lockset:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportLocksetExcel(@Valid LocksetPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<LocksetRespVO> list = locksetService.getLocksetPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "锁具.xls", "数据", LocksetRespVO.class, list);
+    }
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/lockset/vo/LocksetRespVO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -52,4 +54,12 @@ public class LocksetRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-}
+    @Schema(description = "锁具类型Name")
+    private String locksetTypeName;
+
+    @Schema(description = "物资Name")
+    private String materialsName;
+
+
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/lockset/LocksetMapper.java

@@ -5,9 +5,14 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.iscs.controller.admin.notifyconfig.vo.NotifyConfigPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.notifyconfig.vo.NotifyConfigRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.notifyconfig.NotifyConfigDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 锁具 Mapper
@@ -31,4 +36,7 @@ public interface LocksetMapper extends BaseMapperX<LocksetDO> {
                 .orderByDesc(LocksetDO::getId));
     }
 
-}
+    Page<LocksetRespVO> getNotifyConfigPage(Page<LocksetDO> page, @Param(value = "vo") LocksetPageReqVO vo);
+
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/lockset/LocksetService.java

@@ -1,63 +1,63 @@
-package cn.iocoder.yudao.module.iscs.service.lockset;
-
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 锁具 Service 接口
- *
- * @author 芋道源码
- */
-public interface LocksetService extends IService<LocksetDO> {
-
-    /**
-     * 创建锁具
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createLockset(@Valid LocksetSaveReqVO createReqVO);
-
-    /**
-     * 更新锁具
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateLockset(@Valid LocksetSaveReqVO updateReqVO);
-
-    /**
-     * 删除锁具
-     *
-     * @param id 编号
-     */
-    void deleteLockset(Long id);
-
-    /**
-    * 批量删除锁具
-    *
-    * @param ids 编号
-    */
-    void deleteLocksetListByIds(List<Long> ids);
-
-    /**
-     * 获得锁具
-     *
-     * @param id 编号
-     * @return 锁具
-     */
-    LocksetDO getLockset(Long id);
-
-    /**
-     * 获得锁具分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 锁具分页
-     */
-    PageResult<LocksetDO> getLocksetPage(LocksetPageReqVO pageReqVO);
-
-}
+package cn.iocoder.yudao.module.iscs.service.lockset;
+
+import java.util.*;
+import jakarta.validation.*;
+import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 锁具 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface LocksetService extends IService<LocksetDO> {
+
+    /**
+     * 创建锁具
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createLockset(@Valid LocksetSaveReqVO createReqVO);
+
+    /**
+     * 更新锁具
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateLockset(@Valid LocksetSaveReqVO updateReqVO);
+
+    /**
+     * 删除锁具
+     *
+     * @param id 编号
+     */
+    void deleteLockset(Long id);
+
+    /**
+    * 批量删除锁具
+    *
+    * @param ids 编号
+    */
+    void deleteLocksetListByIds(List<Long> ids);
+
+    /**
+     * 获得锁具
+     *
+     * @param id 编号
+     * @return 锁具
+     */
+    LocksetDO getLockset(Long id);
+
+    /**
+     * 获得锁具分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 锁具分页
+     */
+    PageResult<LocksetRespVO> getLocksetPage(LocksetPageReqVO pageReqVO);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/lockset/LocksetServiceImpl.java

@@ -1,94 +1,102 @@
-package cn.iocoder.yudao.module.iscs.service.lockset;
-
-import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-import cn.iocoder.yudao.module.iscs.dal.mysql.lockset.LocksetMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.iscs.enums.ErrorCodeConstants.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 锁具 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class LocksetServiceImpl extends ServiceImpl<LocksetMapper, LocksetDO> implements LocksetService {
-
-    @Resource
-    private LocksetMapper locksetMapper;
-
-    @Override
-    public Long createLockset(LocksetSaveReqVO createReqVO) {
-        // 插入
-        LocksetDO lockset = BeanUtils.toBean(createReqVO, LocksetDO.class);
-        locksetMapper.insert(lockset);
-
-        // 返回
-        return lockset.getId();
-    }
-
-    @Override
-    public void updateLockset(LocksetSaveReqVO updateReqVO) {
-        // 校验存在
-        validateLocksetExists(updateReqVO.getId());
-        // 更新
-        LocksetDO updateObj = BeanUtils.toBean(updateReqVO, LocksetDO.class);
-        locksetMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteLockset(Long id) {
-        // 校验存在
-        validateLocksetExists(id);
-        // 删除
-        locksetMapper.deleteById(id);
-    }
-
-    @Override
-        public void deleteLocksetListByIds(List<Long> ids) {
-        // 校验存在
-        validateLocksetExists(ids);
-        // 删除
-        locksetMapper.deleteByIds(ids);
-        }
-
-    private void validateLocksetExists(List<Long> ids) {
-        List<LocksetDO> list = locksetMapper.selectByIds(ids);
-        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
-            throw exception(LOCKSET_NOT_EXISTS);
-        }
-    }
-
-    private void validateLocksetExists(Long id) {
-        if (locksetMapper.selectById(id) == null) {
-            throw exception(LOCKSET_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public LocksetDO getLockset(Long id) {
-        return locksetMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<LocksetDO> getLocksetPage(LocksetPageReqVO pageReqVO) {
-        return locksetMapper.selectPage(pageReqVO);
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.service.lockset;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.iscs.controller.admin.notifyconfig.vo.NotifyConfigRespVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.notifyconfig.NotifyConfigDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.*;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.lockset.LocksetDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.iscs.dal.mysql.lockset.LocksetMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.module.iscs.enums.ErrorCodeConstants.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 锁具 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class LocksetServiceImpl extends ServiceImpl<LocksetMapper, LocksetDO> implements LocksetService {
+
+    @Resource
+    private LocksetMapper locksetMapper;
+
+    @Override
+    public Long createLockset(LocksetSaveReqVO createReqVO) {
+        // 插入
+        LocksetDO lockset = BeanUtils.toBean(createReqVO, LocksetDO.class);
+        locksetMapper.insert(lockset);
+
+        // 返回
+        return lockset.getId();
+    }
+
+    @Override
+    public void updateLockset(LocksetSaveReqVO updateReqVO) {
+        // 校验存在
+        validateLocksetExists(updateReqVO.getId());
+        // 更新
+        LocksetDO updateObj = BeanUtils.toBean(updateReqVO, LocksetDO.class);
+        locksetMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteLockset(Long id) {
+        // 校验存在
+        validateLocksetExists(id);
+        // 删除
+        locksetMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteLocksetListByIds(List<Long> ids) {
+        // 校验存在
+        validateLocksetExists(ids);
+        // 删除
+        locksetMapper.deleteByIds(ids);
+        }
+
+    private void validateLocksetExists(List<Long> ids) {
+        List<LocksetDO> list = locksetMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(LOCKSET_NOT_EXISTS);
+        }
+    }
+
+    private void validateLocksetExists(Long id) {
+        if (locksetMapper.selectById(id) == null) {
+            throw exception(LOCKSET_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public LocksetDO getLockset(Long id) {
+        return locksetMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<LocksetRespVO> getLocksetPage(LocksetPageReqVO pageReqVO) {
+        Page<LocksetDO> page = new Page<LocksetDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
+        Page<LocksetRespVO> pageResult = locksetMapper.getNotifyConfigPage(page, pageReqVO);
+        PageResult<LocksetRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(pageResult.getRecords());
+        respVOPageResult.setTotal(pageResult.getTotal());
+        return respVOPageResult;
+    }
+
+}

yudao-module-iscs/src/main/resources/mapper/LocksetMapper.xml

@@ -9,4 +9,27 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-</mapper>
+    <select id="getNotifyConfigPage"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.lockset.vo.LocksetRespVO">
+        SELECT
+        l.*,
+        lt.lockset_type_name,
+        m.materials_name
+        FROM
+        isc_lockset l
+        LEFT JOIN isc_lockset_type lt ON l.lockset_type_id = lt.id
+        LEFT JOIN isc_materials m ON l.materials_id = m.id
+        <where>
+            <if test="vo.locksetCode != null and vo.locksetCode.trim != ''">
+                and l.lockset_code like concat('%',#{vo.locksetCode},'%')
+            </if>
+            <if test="vo.locksetName != null and vo.locksetName.trim != ''">
+                and l.lockset_name like concat('%',#{vo.locksetName},'%')
+            </if>
+            <if test="vo.locksetTypeId != null">
+                and l.lockset_type_id = #{vo.locksetTypeId}
+            </if>
+        </where>
+        ORDER BY l.id DESC
+    </select>
+</mapper>