fix 设备管理

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

@@ -2,6 +2,7 @@ package com.ruoyi.hardware.mapper;
 
 import java.util.List;
 import com.ruoyi.hardware.domain.DoumuHardware;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备Mapper接口
@@ -58,6 +59,6 @@ public interface DoumuHardwareMapper
      * @return 结果
      */
     public int deleteDoumuHardwareByHardwareIds(Long[] hardwareIds);
-    public int setType(String type);
+    public int setType( @Param("hardwareType") String type);
     public int setTypeOpen(DoumuHardware doumuHardware);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxPayServiceImpl.java

@@ -23,6 +23,7 @@ import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.omg.CORBA.TIMEOUT;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import utils.AppletDecryptDataUtil;
@@ -62,13 +63,13 @@ public class WxPayServiceImpl implements IWxPayService {
     /**
      * 小程序appId
      */
-    @Value("${wx.appId}")
+    @Value("${wx.app-id}")
     private String appId;
 
     /**
      * 小程序密钥
      */
-    @Value("${wx.appSecret}")
+    @Value("${wx.app-secret}")
     private String appSecret;
 
     @Resource

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

@@ -83,14 +83,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where hardware_id = #{hardwareId}
     </update>
-    <update id="setType">
+    <update id="setType" parameterType = "string">
         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 item="hardwareId" collection="hardwareIds" open="(" separator="," close=")">
+            #{hardwareId}
         </foreach>
     </update>