Merge remote-tracking branch 'origin/main'

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/TbProConfigServiceImpl.java

@@ -157,7 +157,7 @@ public class TbProConfigServiceImpl implements TbProConfigService {
             List<TbProConfigVo> list=mapper.getConfigByProId(params);
             if(list!=null&& !list.isEmpty()){
                 for(TbProConfigVo proConfig:list){
-                    if("0".equals(proConfig.getIsNeed())){
+                    if("0".equals(proConfig.getType())){
                         map.put("tczm",proConfig.getIsNeed());
                     } else{
                         map.put("dgc",proConfig.getIsNeed());

bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/DeviceHandle.java

@@ -47,6 +47,8 @@ public class DeviceHandle {
             }else{
                 System.err.println("数据新增失败---->"+devId);
             }
+        }else {
+            mapper.updateDevStatus(devId);
         }
         deviceVo.setTransId(transId);
         return deviceVo;

bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/DeviceMapper.java

@@ -20,5 +20,9 @@ public interface DeviceMapper {
      */
     int insertDeviceVo(DeviceVo deviceVo);
 
-
+    /**
+     * 更新设备状态
+     * @param devId
+     */
+    void updateDevStatus(@Param("devId")String devId);
 }

bonus-modules/bonus-urk/src/main/resources/mapper/urk/DeviceMapper.xml

@@ -8,6 +8,9 @@
                          #{devCode},#{deviceName},#{devModel},#{onLine},1   )
 
     </insert>
+    <update id="updateDevStatus">
+        update  pm_att_device set on_line=1, on_line_time=now() where device_code=#{devId}
+    </update>
     <!--查询设备基础信息-->
     <select id="getDeviceVoById" resultType="com.bonus.urk.vo.DeviceVo">
         select device_code devCode,device_name deviceName,     pro_id proId,