南昌市物联网技防平台-后台
nnnjjj123
2021-03-02 7b3fb2ea4eb3c8539ce3019bfafacb7ca3b21096
1.目录树调整
5 files modified
15 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml 4 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java 4 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
@@ -40,4 +40,5 @@
    List<Map<String, Object>> selectCatalogEqNUmber();
    List<catalogVO> lazyTree(String tenantId, Long parentId);
    void updateCatalog(String name, String eqid);
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -106,4 +106,8 @@
        </if>
    </select>
    <update id="updateCatalog">
    update sys_catalog SET name=#{name} where eqid=#{eqid}
</update>
</mapper>
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
@@ -37,4 +37,5 @@
    List<Map<String, Object>> selectEq();
    List<Map<String, Object>> selectWar(String beginTime,String endTime);
    List<catalogVO> lazyTree(String tenantId, Long parentId);
    void updateCatalog(String name, String eqid);
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
@@ -70,4 +70,9 @@
    public List<catalogVO> lazyTree(String tenantId, Long parentId) {
        return baseMapper.lazyTree(tenantId, parentId);
    }
    @Override
    public void updateCatalog(String name, String eqid) {
        baseMapper.updateCatalog(name, eqid);
    }
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -343,7 +343,9 @@
        if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
            equipment.setHeartbeat(null);
        }
        String deviceName = equipment.getDeviceName();
        String deviceNumber = equipment.getDeviceNumber();
        catalogService.updateCatalog(deviceName,deviceNumber);
        return R.status(equipmentService.saveOrUpdate(equipment));
    }