fix 设备管理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/hardware/DoumuHardwareController.java

@@ -114,4 +114,16 @@ public class DoumuHardwareController extends BaseController
     {
         return doumuHardwareService.setType(type);
     }
+
+    /**
+     * 根据id一键开启/关闭
+     * @return 结果
+     */
+
+    @PreAuthorize("@ss.hasPermi('hardware:hardware:type')")
+    @PostMapping("/open")
+    public AjaxResult setTypeOpen(@RequestBody DoumuHardware doumuHardware)
+    {
+        return doumuHardwareService.setTypeOpen(doumuHardware);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/hardware/domain/DoumuHardware.java

@@ -41,8 +41,18 @@ public class DoumuHardware extends BaseEntity
     /** 设备状态 */
     @Excel(name = "设备状态")
     private String hardwareType;
+    /** 设备id */
+    private Long[] hardwareIds;
+
+    public Long[] getHardwareIds() {
+        return hardwareIds;
+    }
+
+    public void setHardwareIds(Long[] hardwareIds) {
+        this.hardwareIds = hardwareIds;
+    }
 
-    public void setHardwareId(Long hardwareId) 
+    public void setHardwareId(Long hardwareId)
     {
         this.hardwareId = hardwareId;
     }

ruoyi-system/src/main/java/com/ruoyi/hardware/mapper/DoumuHardwareMapper.java

@@ -59,4 +59,5 @@ public interface DoumuHardwareMapper
      */
     public int deleteDoumuHardwareByHardwareIds(Long[] hardwareIds);
     public int setType(String type);
+    public int setTypeOpen(DoumuHardware doumuHardware);
 }

ruoyi-system/src/main/java/com/ruoyi/hardware/service/IDoumuHardwareService.java

@@ -61,4 +61,5 @@ public interface IDoumuHardwareService
      */
     public int deleteDoumuHardwareByHardwareId(Long hardwareId);
     public AjaxResult setType(String type);
+    public AjaxResult setTypeOpen(DoumuHardware doumuHardware);
 }

ruoyi-system/src/main/java/com/ruoyi/hardware/service/impl/DoumuHardwareServiceImpl.java

@@ -15,57 +15,53 @@ import utils.QRCodeUtils;
 
 /**
  * 设备Service业务层处理
- * 
+ *
  * @author boman
  * @date 2024-01-23
  */
 @Service
-public class DoumuHardwareServiceImpl implements IDoumuHardwareService 
-{
+public class DoumuHardwareServiceImpl implements IDoumuHardwareService {
     @Autowired
     private DoumuHardwareMapper doumuHardwareMapper;
 
     /**
      * 查询设备
-     * 
+     *
      * @param hardwareId 设备主键
      * @return 设备
      */
     @Override
-    public DoumuHardware selectDoumuHardwareByHardwareId(Long hardwareId)
-    {
+    public DoumuHardware selectDoumuHardwareByHardwareId(Long hardwareId) {
         return doumuHardwareMapper.selectDoumuHardwareByHardwareId(hardwareId);
     }
 
     /**
      * 查询设备列表
-     * 
+     *
      * @param doumuHardware 设备
      * @return 设备
      */
     @Override
-    public List<DoumuHardware> selectDoumuHardwareList(DoumuHardware doumuHardware)
-    {
+    public List<DoumuHardware> selectDoumuHardwareList(DoumuHardware doumuHardware) {
         return doumuHardwareMapper.selectDoumuHardwareList(doumuHardware);
     }
 
     /**
      * 新增设备
-     * 
+     *
      * @param doumuHardware 设备
      * @return 结果
      */
     @Override
-    public int insertDoumuHardware(DoumuHardware doumuHardware)
-    {
+    public int insertDoumuHardware(DoumuHardware doumuHardware) {
         doumuHardware.setCreateTime(DateUtils.getNowDate());
         //根据设备编号生成二维码
         String hardwareNum = doumuHardware.getHardwareNum();
-        if (StringUtils.isEmpty(hardwareNum)){
+        if (StringUtils.isEmpty(hardwareNum)) {
             return 0;
         }
         try {
-            String imagePath= QRCodeUtils.encode(hardwareNum, null, RuoYiConfig.getUploadQrPath(), true);
+            String imagePath = QRCodeUtils.encode(hardwareNum, null, RuoYiConfig.getUploadQrPath(), true);
             doumuHardware.setHardwareUrl(imagePath);
         } catch (Exception e) {
             e.printStackTrace();
@@ -75,18 +71,17 @@ public class DoumuHardwareServiceImpl implements IDoumuHardwareService
 
     /**
      * 修改设备
-     * 
+     *
      * @param doumuHardware 设备
      * @return 结果
      */
     @Override
-    public int updateDoumuHardware(DoumuHardware doumuHardware)
-    {
+    public int updateDoumuHardware(DoumuHardware doumuHardware) {
         DoumuHardware doumuHardwareOld = doumuHardwareMapper.selectDoumuHardwareByHardwareId(doumuHardware.getHardwareId());
         doumuHardware.setUpdateTime(DateUtils.getNowDate());
         //判断设备编号是否被修改
-        if (!doumuHardwareOld.getHardwareNum().equals(doumuHardware.getHardwareNum())){
-            String imagePath= null;
+        if (!doumuHardwareOld.getHardwareNum().equals(doumuHardware.getHardwareNum())) {
+            String imagePath = null;
             try {
                 imagePath = QRCodeUtils.encode(doumuHardware.getHardwareNum(), null, RuoYiConfig.getUploadQrPath(), true);
                 doumuHardware.setHardwareUrl(imagePath);
@@ -99,35 +94,46 @@ public class DoumuHardwareServiceImpl implements IDoumuHardwareService
 
     /**
      * 批量删除设备
-     * 
+     *
      * @param hardwareIds 需要删除的设备主键
      * @return 结果
      */
     @Override
-    public int deleteDoumuHardwareByHardwareIds(Long[] hardwareIds)
-    {
+    public int deleteDoumuHardwareByHardwareIds(Long[] hardwareIds) {
         return doumuHardwareMapper.deleteDoumuHardwareByHardwareIds(hardwareIds);
     }
 
     /**
      * 删除设备信息
-     * 
+     *
      * @param hardwareId 设备主键
      * @return 结果
      */
     @Override
-    public int deleteDoumuHardwareByHardwareId(Long hardwareId)
-    {
+    public int deleteDoumuHardwareByHardwareId(Long hardwareId) {
         return doumuHardwareMapper.deleteDoumuHardwareByHardwareId(hardwareId);
     }
 
     /**
      * 一键开启/关闭
+     *
      * @return 结果
      */
     @Override
-    public AjaxResult setType (String type)
-    {
-        return doumuHardwareMapper.setType(type);
+    public AjaxResult setType(String type) {
+        int rows = doumuHardwareMapper.setType(type);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 根据设备id来开启关闭
+     *
+     * @param doumuHardware
+     * @return
+     */
+    @Override
+    public AjaxResult setTypeOpen(DoumuHardware doumuHardware) {
+        int rows =  doumuHardwareMapper.setTypeOpen(doumuHardware);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 }

ruoyi-system/src/main/resources/mapper/system/DoumuHardwareMapper.xml

@@ -86,6 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="setType">
         update doumu_hardware set hardware_type = #{hardwareType}
     </update>
+    <update id="setTypeOpen">
+        update doumu_hardware set hardware_type = #{hardwareType}
+        where hardware_id in
+        <foreach item="hardwareIds" collection="array" open="(" separator="," close=")">
+            #{hardwareIds}
+        </foreach>
+    </update>
 
     <delete id="deleteDoumuHardwareByHardwareId" parameterType="Long">
         delete from doumu_hardware where hardware_id = #{hardwareId}