feat: 新增获取设备号

guzijian
1 parent 214a3706
Showing 5 changed files with 54 additions and 48 deletions
Bsth-admin/src/main/java/com/ruoyi/BsthServletInitializer.java
Bsth-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.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/java/com/ruoyi/pojo/vo/EquipmentResponseVo.java
@@ -2,14 +2,6 @@ package com.ruoyi;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.HashMap;
-import java.util.Map;
 /**
  * web容器中进行部署
@@ -23,22 +15,4 @@ public class BsthServletInitializer extends SpringBootServletInitializer
     {
         return application.sources(BsthApplication.class);
     }
-
-    // 测试方法
-    public static void main(String[] args) {
-        RestTemplate restTemplate = new RestTemplate();
-        String url = "http://1.14.107.94:8100/driver/driver";
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization", "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImNhOGRhOGJlLWQ0ZjItNDhjMy05ZWU1LWJkMDQzYzY3YzQ0MyJ9.79b8JM31faxhLnIqu6xGtrx1JK019NoN26AwNfPzptYSriHSTABdYp16kzKD538wo2HfXhYoviSqy4qZfoEV5Q");
-        Map<String, String> requestBody = new HashMap<>();
-        requestBody.put("jobCode", "asdfasd");
-        requestBody.put("personnelName", "asdfasdf");
-
-        HttpEntity<Map<String, String>> entity = new HttpEntity<>(requestBody, headers);
-
-        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
-
-        String responseBody = response.getBody();
-        System.out.println(responseBody);
-    }
 }
@@ -100,6 +100,15 @@ public class EquipmentController extends BaseController {
     }
     /**
+     * 查询当前所有设备信息
+     */
+    @GetMapping("/getEquipmentAll")
+    @ApiOperation("获取所有设备设备号")
+    public AjaxResult getEquipmentAll(){
+        return AjaxResult.success(equipmentService.getEquipmentAll());
+    }
+
+    /**
      * 删除设备信息
      */
 //    @PreAuthorize("@ss.hasPermi('equipment:equipment:remove')")
@@ -3,6 +3,7 @@ package com.ruoyi.equipment.service;
 import java.util.List;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
+import com.ruoyi.pojo.vo.EquipmentResponseVo;
 /**
  * 设备信息Service接口
@@ -61,4 +62,6 @@ public interface IEquipmentService
     public int deleteEquipmentById(Long id);
     List<EquipmentLog> queryLog(EquipmentLog log);
+
+    List<EquipmentResponseVo> getEquipmentAll();
 }
 package com.ruoyi.equipment.service.impl;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.equipment.domain.EquipmentLog;
 import com.ruoyi.pojo.equipment.EquipmentOnline;
+import com.ruoyi.pojo.vo.EquipmentResponseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
@@ -16,13 +19,12 @@ import javax.annotation.Resource;
 /**
  * 设备信息Service业务层处理
- * 
+ *
  * @author guzijian
  * @date 2023-07-05
  */
 @Service
-public class EquipmentServiceImpl implements IEquipmentService 
-{
+public class EquipmentServiceImpl implements IEquipmentService {
     @Autowired
     private EquipmentMapper equipmentMapper;
@@ -31,40 +33,37 @@ public class EquipmentServiceImpl implements IEquipmentService
     /**
      * 查询设备信息
-     * 
+     *
      * @param id 设备信息主键
      * @return 设备信息
      */
     @Override
-    public Equipment selectEquipmentById(Long id)
-    {
+    public Equipment selectEquipmentById(Long id) {
         return equipmentMapper.selectEquipmentById(id);
     }
     /**
      * 查询设备信息列表
-     * 
+     *
      * @param equipment 设备信息
      * @return 设备信息
      */
     @Override
-    public List<Equipment> selectEquipmentList(Equipment equipment)
-    {
+    public List<Equipment> selectEquipmentList(Equipment equipment) {
         return equipmentMapper.selectEquipmentList(equipment);
     }
     /**
      * 新增设备信息
-     * 
+     *
      * @param equipment 设备信息
      * @return 结果
      */
     @Override
-    public int insertEquipment(Equipment equipment)
-    {
+    public int insertEquipment(Equipment equipment) {
         equipment.setCreateTime(DateUtils.getNowDate());
         equipment.setCreateBy(SecurityUtils.getUsername());
-        if (!StringUtils.isNotEmpty(equipment.getDeviceId())){
+        if (!StringUtils.isNotEmpty(equipment.getDeviceId())) {
             throw new RuntimeException("设备号不能为空");
         }
         return equipmentMapper.insertEquipment(equipment);
@@ -72,13 +71,12 @@ public class EquipmentServiceImpl implements IEquipmentService
     /**
      * 修改设备信息
-     * 
+     *
      * @param equipment 设备信息
      * @return 结果
      */
     @Override
-    public int updateEquipment(Equipment equipment)
-    {
+    public int updateEquipment(Equipment equipment) {
         equipment.setUpdateTime(DateUtils.getNowDate());
         equipment.setUpdateBy(SecurityUtils.getUsername());
         return equipmentMapper.updateEquipment(equipment);
@@ -86,25 +84,23 @@ public class EquipmentServiceImpl implements IEquipmentService
     /**
      * 批量删除设备信息
-     * 
+     *
      * @param ids 需要删除的设备信息主键
      * @return 结果
      */
     @Override
-    public int deleteEquipmentByIds(Long[] ids)
-    {
+    public int deleteEquipmentByIds(Long[] ids) {
         return equipmentMapper.deleteEquipmentByIds(ids);
     }
     /**
      * 删除设备信息信息
-     * 
+     *
      * @param id 设备信息主键
      * @return 结果
      */
     @Override
-    public int deleteEquipmentById(Long id)
-    {
+    public int deleteEquipmentById(Long id) {
         return equipmentMapper.deleteEquipmentById(id);
     }
@@ -112,4 +108,16 @@ public class EquipmentServiceImpl implements IEquipmentService
     public List<EquipmentLog> queryLog(EquipmentLog log) {
         return equipmentMapper.queryLog(log);
     }
+
+    @Override
+    public List<EquipmentResponseVo> getEquipmentAll() {
+        List<Equipment> list = equipmentMapper.selectEquipmentList(null);
+
+        return list.stream().map(item -> {
+            EquipmentResponseVo vo = new EquipmentResponseVo();
+            vo.setLabel(item.getDeviceId());
+            vo.setValue(item.getDeviceId());
+            return vo;
+        }).collect(Collectors.toList());
+    }
 }
+package com.ruoyi.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * @author 20412
+ */
+@Data
+public class EquipmentResponseVo {
+    private String value;
+    private String label;
+}