版本修复

zengh

2021-11-04 57c72c8438ccb461d5d2f751f710d6908f0e0d32

版本修复

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -261,6 +261,12 @@
            <if test="alarm.jtype!=null">
                and jtype = #{alarm.jtype}
            </if>
        <if test="alarm.rname!=null">
            and rname like concat('%',#{alarm.rname},'%')
        </if>
        <if test="alarm.deviceNumber!=null">
            and deviceNumber like concat('%',#{alarm.deviceNumber},'%')
        </if>
            AND waringType IN ( "安装任务" )
        ORDER BY
            jtype ASC,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -462,6 +462,8 @@
            equipmentService.saveImg(equipment);
        }

        equipmentService.updateRW(equipment);

        return R.status(equipmentService.saveOrUpdate(equipment));
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java

@@ -43,6 +43,7 @@
    void s(Equipment equipment);
    void updateOne(Equipment equipment);
    void saveImg(EquipmentVO equipment);
    void updateRW(EquipmentVO equipment);
    void updataType(String arr);
    void updataTypeC(String arr);
    /**

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -365,6 +365,11 @@
     where id=#{id}
    </update>

    <update id="updateRW">
    update sys_alarm SET jtype= 1
     where id=#{rwid}
    </update>

    <update id="updataType">
        update sys_equipment SET devicestate = 1 where id in (${arr})
    </update>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java

@@ -55,6 +55,8 @@

    void saveImg(EquipmentVO equipment);

    void updateRW(EquipmentVO equipment);

    void s(Equipment equipment);

    void updataType(String arr);

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java

@@ -104,6 +104,11 @@
    }

    @Override
    public void updateRW(EquipmentVO equipment) {
        baseMapper.updateRW(equipment);
    }

    @Override
    public void s(Equipment equipment) {
        baseMapper.s(equipment);
    }

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java

@@ -50,7 +50,7 @@
    String call;
    String paddress;
    String deploymentTime;

    String rwid;