Commit fbe36b68b32ca2c796f465ae4fa3a50958ab73e3

Authored by guzijian
1 parent ff3c2072

feat: 新增签到查询条件

Bsth-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
@@ -118,4 +118,9 @@ public class EquipmentController extends BaseController { @@ -118,4 +118,9 @@ public class EquipmentController extends BaseController {
118 public AjaxResult remove(@PathVariable Long[] ids) { 118 public AjaxResult remove(@PathVariable Long[] ids) {
119 return toAjax(equipmentService.deleteEquipmentByIds(ids)); 119 return toAjax(equipmentService.deleteEquipmentByIds(ids));
120 } 120 }
  121 +
  122 + @GetMapping("/getEquipmentSiteName")
  123 + public AjaxResult getEquipmentSiteName () {
  124 + return AjaxResult.success(equipmentService.getEquipmentSiteName());
  125 + }
121 } 126 }
Bsth-admin/src/main/java/com/ruoyi/equipment/service/IEquipmentService.java
@@ -64,4 +64,7 @@ public interface IEquipmentService @@ -64,4 +64,7 @@ public interface IEquipmentService
64 List<EquipmentLog> queryLog(EquipmentLog log); 64 List<EquipmentLog> queryLog(EquipmentLog log);
65 65
66 List<EquipmentResponseVo> getEquipmentAll(); 66 List<EquipmentResponseVo> getEquipmentAll();
  67 +
  68 + List<String> getEquipmentSiteName();
  69 +
67 } 70 }
Bsth-admin/src/main/java/com/ruoyi/equipment/service/impl/EquipmentServiceImpl.java
@@ -120,4 +120,11 @@ public class EquipmentServiceImpl implements IEquipmentService { @@ -120,4 +120,11 @@ public class EquipmentServiceImpl implements IEquipmentService {
120 return vo; 120 return vo;
121 }).collect(Collectors.toList()); 121 }).collect(Collectors.toList());
122 } 122 }
  123 +
  124 + @Override
  125 + public List<String> getEquipmentSiteName() {
  126 + List<Equipment> list = equipmentMapper.selectEquipmentList(null);
  127 + List<String> equipment = list.stream().map(Equipment::getSiteName).distinct().collect(Collectors.toList());
  128 + return equipment;
  129 + }
123 } 130 }