添加选择信息

liujun001
1 parent 73b377fe
Showing 5 changed files with 46 additions and 8 deletions
Bsth-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/equipment/mapper/EquipmentMapper.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/IEquipmentService.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/impl/EquipmentServiceImpl.java
Bsth-admin/src/main/resources/application-druid-dev.yml
@@ -43,6 +43,13 @@ public class EquipmentController extends BaseController {
         return getDataTable(list);
     }
  
+    @PostMapping(value = "list/select")
+    @ApiOperation("设备列表（页面选择）")
+    public AjaxResult listSelect(@RequestBody Equipment equipment) {
+        List<Equipment> equipmentList = equipmentService.listOfSelect(equipment);
+        return AjaxResult.success(equipmentList);
+    }
+
     /**
      * 导出设备信息列表
      */
@@ -61,7 +68,7 @@ public class EquipmentController extends BaseController {
      */
     @GetMapping("/log")
     @ApiOperation("设备日志")
-    public TableDataInfo log(@ModelAttribute EquipmentLog log){
+    public TableDataInfo log(@ModelAttribute EquipmentLog log) {
         startPage();
         List<EquipmentLog> list = equipmentService.queryLog(log);
         return getDataTable(list);
@@ -104,7 +111,7 @@ public class EquipmentController extends BaseController {
      */
     @GetMapping("/getEquipmentAll")
     @ApiOperation("获取所有设备设备号")
-    public AjaxResult getEquipmentAll(){
+    public AjaxResult getEquipmentAll() {
         return AjaxResult.success(equipmentService.getEquipmentAll());
     }
  
@@ -120,7 +127,7 @@ public class EquipmentController extends BaseController {
     }
  
     @GetMapping("/getEquipmentSiteName")
-    public AjaxResult getEquipmentSiteName () {
+    public AjaxResult getEquipmentSiteName() {
         return AjaxResult.success(equipmentService.getEquipmentSiteName());
     }
 }
@@ -2,6 +2,8 @@ package com.ruoyi.equipment.mapper;
  
 import java.util.List;
  
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
@@ -14,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
  * @author guzijian
  * @date 2023-07-05
  */
-public interface EquipmentMapper 
+public interface EquipmentMapper extends BaseMapper<Equipment>
 {
     /**
      * 查询设备信息
 package com.ruoyi.equipment.service;
  
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
 import com.ruoyi.pojo.vo.EquipmentResponseVo;
@@ -11,7 +14,7 @@ import com.ruoyi.pojo.vo.EquipmentResponseVo;
  * @author guzijian
  * @date 2023-07-05
  */
-public interface IEquipmentService 
+public interface IEquipmentService extends IService<Equipment>
 {
     /**
      * 查询设备信息
@@ -20,6 +23,14 @@ public interface IEquipmentService
      * @return 设备信息
      */
     public Equipment selectEquipmentById(Long id);
+    /***
+     *用于页面选择
+     * @author liujun
+     * @date 2024/6/21 20:51
+     * @param equipment
+     * @return java.util.List<com.ruoyi.equipment.domain.Equipment>
+     */
+    List<Equipment> listOfSelect(Equipment equipment);
  
     /**
      * 查询设备信息列表
 package com.ruoyi.equipment.service.impl;
  
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.equipment.domain.EquipmentLog;
+import com.ruoyi.mapper.keyinfo.KeyInfoMapper;
 import com.ruoyi.pojo.equipment.EquipmentOnline;
 import com.ruoyi.pojo.vo.EquipmentResponseVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +19,7 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
+import org.springframework.web.bind.annotation.ModelAttribute;
  
 import javax.annotation.Resource;
  
@@ -24,7 +30,7 @@ import javax.annotation.Resource;
  * @date 2023-07-05
  */
 @Service
-public class EquipmentServiceImpl implements IEquipmentService {
+public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment> implements IEquipmentService {
     @Autowired
     private EquipmentMapper equipmentMapper;
  
@@ -42,6 +48,16 @@ public class EquipmentServiceImpl implements IEquipmentService {
         return equipmentMapper.selectEquipmentById(id);
     }
  
+    @Override
+    public List<Equipment> listOfSelect(@ModelAttribute Equipment equipment) {
+        LambdaQueryWrapper<Equipment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(Equipment::getId, Equipment::getSiteName);
+        if(StringUtils.isNotEmpty(equipment.getPromise())){
+            wrapper.eq(Equipment::getPromise,equipment.getPromise());
+        }
+        return list(wrapper);
+    }
+
     /**
      * 查询设备信息列表
      *
@@ -30,9 +30,11 @@ spring:
                 # 测试地址
                # url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
                 #url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-                url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+               # url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://127.0.0.1:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: guzijian
+               # password: guzijian
+                password: 1
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭